summaryrefslogtreecommitdiff
path: root/builtin/merge-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-08-26 18:16:26 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-08-26 18:16:26 (GMT)
commit4109c28e055dba27d73cefb956bea5e611f66ec0 (patch)
tree8b323ced930a0eb5bb7912059506278f88ec36a9 /builtin/merge-tree.c
parenta3d54f9a1fa481727a849b8753fc9d1abafe6583 (diff)
parente09867f0605702c2d4e65b99e178cdaa215a7370 (diff)
downloadgit-4109c28e055dba27d73cefb956bea5e611f66ec0.zip
git-4109c28e055dba27d73cefb956bea5e611f66ec0.tar.gz
git-4109c28e055dba27d73cefb956bea5e611f66ec0.tar.bz2
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
Diffstat (limited to 'builtin/merge-tree.c')
0 files changed, 0 insertions, 0 deletions