]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: dca05bb 366f9ce)
Merge branch 'da/difftool'
authorJunio C Hamano <gitster@pobox.com>
Mon, 23 May 2016 21:54:36 +0000 (14:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 23 May 2016 21:54:36 +0000 (14:54 -0700)
commitf895dd7422766f8ce95433619510e957e54f60cd
tree7cc3a9bd2422588931d142ce1492351ca82ee216tree | snapshot
parentdca05bb5913026fb64f6392675e7ab3ff643dceccommit | diff
parent366f9cea18fbb7ebb0a75735da8c2a9d5a916809commit | diff
Merge branch 'da/difftool'

"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
t/t7800-difftool.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.