]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
* da/difftool-dir-diff-fix:
  difftool: fix dir-diff index creation when in a subdirectory

1  2 
contrib/examples/git-difftool.perl patch | diff1 | diff2 | blob | history
t/t7800-difftool.sh patch | diff1 | diff2 | blob | history

diff --cc contrib/examples/git-difftool.perl
Simple merge
diff --cc t/t7800-difftool.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.