Merge branch 'jk/diff-tree-t-fix' into nextnext
commit0f652d635f0819f4812ed7ac3d5b92223b412edf
authorJunio C Hamano <gitster@pobox.com>
Thu, 21 Aug 2014 19:07:40 +0000 (21 12:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 21 Aug 2014 19:07:40 +0000 (21 12:07 -0700)
treed021b110f23e803e1ec80bc101f464f58b8751ce
parente04c9351167db4883e0d8c6889cb40fea63666ec
parente09867f0605702c2d4e65b99e178cdaa215a7370
Merge branch 'jk/diff-tree-t-fix' into next

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