![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 26 Oct 2011 23:12:25 +0000 (16:12 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 26 Oct 2011 23:12:25 +0000 (16:12 -0700) |
* jm/mergetool-pathspec:
mergetool: no longer need to save standard input
mergetool: Use args as pathspec to unmerged files
mergetool: no longer need to save standard input
mergetool: Use args as pathspec to unmerged files
| 1 | 2 | |||
|---|---|---|---|---|
| Documentation/git-mergetool.txt | patch | | diff1 | | diff2 | | blob | history |
| git-mergetool.sh | patch | | diff1 | | diff2 | | blob | history |
diff --cc Documentation/git-mergetool.txt
Simple merge
diff --cc git-mergetool.sh
Simple merge