git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cf36a4d e66adca)
Merge branch 'js/difftool-builtin'
authorJunio C Hamano <redacted>
Fri, 10 Feb 2017 20:52:25 +0000 (12:52 -0800)
committerJunio C Hamano <redacted>
Fri, 10 Feb 2017 20:52:25 +0000 (12:52 -0800)
commit163d24dc4d914191d1981ed0d9fa2a5d91b7d412
tree99efdce4c601aeca8dbeea4779a39e651c3b46fdtree | snapshot
parentcf36a4dc3589da2df8ab2101b5c385f12abcd67dcommit | diff
parente66adcadfe63508dfd7410c2253116043894d298commit | diff
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
t/t7800-difftool.sh diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT