| commit | cddb7cec66ff92a810541177586a68e80be38faa | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Aug 2014 19:33:52 +0000 (25 12:33 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Aug 2014 19:33:52 +0000 (25 12:33 -0700) | ||
| tree | 5e169410ec22bc637e417cd6919f2ddff1619a11 | treesnapshot (tar.gz zip) |
| parent | f3160574103ee934e446a73e1ae1c64181b3c54a | commitdiff |
| parent | d782a9157bfb64b7cb80f0905973b3c7cf272f3d | commitdiff |
Merge branch 'cb/mergetool-difftool' into jch
Update the way the "difftool --help" shows the help message that is
shared with the "mergetool" to reduce one shell dependency.
* cb/mergetool-difftool:
difftool: don't assume that default sh is sane
mergetool: don't require a work tree for --tool-help
Update the way the "difftool --help" shows the help message that is
shared with the "mergetool" to reduce one shell dependency.
* cb/mergetool-difftool:
difftool: don't assume that default sh is sane
mergetool: don't require a work tree for --tool-help