![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 10 Oct 2011 22:56:18 +0000 (15:56 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 10 Oct 2011 22:56:18 +0000 (15:56 -0700) | ||
| commit | 5fbdb9c2e8cc7226d9a9e7de5ad09ac5f0a0b906 | |
| tree | 76972a1c5eebdc2ade46704ac95b04c712e5321b | tree | snapshot |
| parent | 7ddd582402aa926d5ec33d914ccc8bfaf1b15c06 | commit | diff |
| parent | 6d9990a959c0168ab6dfe75236980f95ac512ce5 | commit | diff |
Merge branch 'jm/mergetool-pathspec'
* 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 | | blob | history |
| git-mergetool.sh | diff1 | | diff2 | | blob | history |