Merge branch 'jk/diff-tree-t-fix'
commit4109c28e055dba27d73cefb956bea5e611f66ec0
authorJunio C Hamano <gitster@pobox.com>
Tue, 26 Aug 2014 18:16:26 +0000 (26 11:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 26 Aug 2014 18:16:26 +0000 (26 11:16 -0700)
tree8b323ced930a0eb5bb7912059506278f88ec36a9
parenta3d54f9a1fa481727a849b8753fc9d1abafe6583
parente09867f0605702c2d4e65b99e178cdaa215a7370
Merge branch 'jk/diff-tree-t-fix'

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