| commit | 163d24dc4d914191d1981ed0d9fa2a5d91b7d412 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 10 Feb 2017 20:52:25 +0000 (10 12:52 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 10 Feb 2017 20:52:25 +0000 (10 12:52 -0800) | ||
| tree | 99efdce4c601aeca8dbeea4779a39e651c3b46fd | treesnapshot (tar.gz zip) |
| parent | cf36a4dc3589da2df8ab2101b5c385f12abcd67d | commitdiff |
| parent | e66adcadfe63508dfd7410c2253116043894d298 | commitdiff |
Merge branch 'js/difftool-builtin'
A few hot-fixes to C-rewrite of "git difftool".
* js/difftool-builtin:
t7800: simplify basic usage test
difftool: fix bug when printing usage
A few hot-fixes to C-rewrite of "git difftool".
* js/difftool-builtin:
t7800: simplify basic usage test
difftool: fix bug when printing usage
| t/t7800-difftool.sh | diff1 | diff2 | blobhistory |