]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7dcbf89 366f9ce)
Merge branch 'da/difftool' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 6 Jun 2016 21:27:37 +0000 (14:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 6 Jun 2016 21:27:37 +0000 (14:27 -0700)
"git difftool" learned to handle unmerged paths correctly in
dir-diff mode.

* da/difftool:
  difftool: handle unmerged files in dir-diff mode
  difftool: initialize variables for readability

1  2 
t/t7800-difftool.sh patch | diff1 | diff2 | blob | history

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