projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit389c3289cfa5bc0a232ad52df70fae1f6863d1a4
tree15092587a7ff56f43c48ea3718800087277afc6btree | snapshot
parent7dcbf891d975eba5b1e3095cb3b389834689ac09commit | diff
parent366f9cea18fbb7ebb0a75735da8c2a9d5a916809commit | diff
Merge branch 'da/difftool' into maint

"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.