Files
git/Documentation/git-mergetool.txt
Junio C Hamano b8e830fdb1 Merge branch 'jm/mergetool-pathspec' into next
* jm/mergetool-pathspec:
  mergetool: no longer need to save standard input
  mergetool: Use args as pathspec to unmerged files
2011-10-06 15:41:52 -07:00

3.2 KiB