Andrew's git / gitweb.git / diff
?
Merge branch 'jk/diff-tree-t-fix'
authorJunio C Hamano <gitster@pobox.com>
Tue, 26 Aug 2014 18:16:26 +0000 (11:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 26 Aug 2014 18:16:26 +0000 (11:16 -0700)
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

1  2 
combine-diff.c patch | diff1 | diff2 | blob | history
t/t4038-diff-combined.sh patch | diff1 | diff2 | blob | history
diff --cc combine-diff.c
Simple merge
diff --cc t/t4038-diff-combined.sh
Simple merge