Andrew's git / gitweb.git / diff
?
Merge branch 'jm/mergetool-pathspec' into maint-1.7.6
authorJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2011 23:12:25 +0000 (16:12 -0700)
committerJunio 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

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