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
Junio C Hamano committed
Oct 26, 2011 at 16:12 UTC
87d99c64dfa8880592104245896557aa530d4fd9
No changes.