| commit | b8e830fdb186f38502a6541265bea3c60c00c203 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 6 Oct 2011 22:41:52 +0000 (6 15:41 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 6 Oct 2011 22:41:52 +0000 (6 15:41 -0700) | ||
| tree | aabc723368abfe2d65eddcd5fb62d117fbca6caf | treesnapshot (tar.gz zip) |
| parent | 36c972d2e3b6519efce51d613c74c4bf1e08132a | commitdiff |
| parent | 6d9990a959c0168ab6dfe75236980f95ac512ce5 | commitdiff |
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
* jm/mergetool-pathspec:
mergetool: no longer need to save standard input
mergetool: Use args as pathspec to unmerged files
| Documentation/git-mergetool.txt | diff1 | diff2 | blobhistory |
| git-mergetool.sh | diff1 | diff2 | blobhistory |