Merge branch 'jk/diff-tree-t-fix' into jch
commit50519cc3cfb06b451ad559569771c781b470765a
authorJunio C Hamano <gitster@pobox.com>
Thu, 21 Aug 2014 18:12:01 +0000 (21 11:12 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 21 Aug 2014 18:12:02 +0000 (21 11:12 -0700)
tree472241e04dc7bfad2f967575717eaaf2d4109f03
parent40b1d6754f576dd4606954411a526a7637a97bd4
parente09867f0605702c2d4e65b99e178cdaa215a7370
Merge branch 'jk/diff-tree-t-fix' into jch

Fix (rarely used) "git diff-tree -t" regression in 2.0.

* jk/diff-tree-t-fix:
  intersect_paths: respect mode in git's tree-sort
combine-diff.c
t/t4038-diff-combined.sh