]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e66adca 853e10c)
Merge branch 'da/difftool-dir-diff-fix' into da/t7800-cleanup
authorJunio C Hamano <gitster@pobox.com>
Wed, 8 Feb 2017 21:36:03 +0000 (13:36 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Feb 2017 21:36:03 +0000 (13:36 -0800)
commita83c2d2972b7821e45192df08142d27ebc51da48
tree06647fcd34262da86bee65a45477fecccd579f22tree | snapshot
parente66adcadfe63508dfd7410c2253116043894d298commit | diff
parent853e10c19755669bd4695b1d9fd81f3278466727commit | diff
Merge branch 'da/difftool-dir-diff-fix' into da/t7800-cleanup

* da/difftool-dir-diff-fix:
  difftool: fix dir-diff index creation when in a subdirectory
contrib/examples/git-difftool.perl diff1 | diff2 | blob | history
t/t7800-difftool.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.