diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-26 23:12:25 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-26 23:12:25 (GMT) |
| commit | 87d99c64dfa8880592104245896557aa530d4fd9 (patch) | |
| tree | baf019f2b0272eb4a6033d9f1c78f0f80be9d665 /Documentation/git-difftool.txt | |
| parent | 716b64a73e65d7494dfb37631292fcbe8cb34cc0 (diff) | |
| parent | 6d9990a959c0168ab6dfe75236980f95ac512ce5 (diff) | |
| download | git-87d99c64dfa8880592104245896557aa530d4fd9.zip git-87d99c64dfa8880592104245896557aa530d4fd9.tar.gz git-87d99c64dfa8880592104245896557aa530d4fd9.tar.bz2 | |
Merge branch 'jm/mergetool-pathspec' into maint-1.7.6
* jm/mergetool-pathspec:
mergetool: no longer need to save standard input
mergetool: Use args as pathspec to unmerged files
Diffstat (limited to 'Documentation/git-difftool.txt')
0 files changed, 0 insertions, 0 deletions