summaryrefslogtreecommitdiff
path: root/convert.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-12-22 11:27:29 -0800
committerJunio C Hamano <gitster@pobox.com>2011-12-22 11:27:29 -0800
commite927c1675171a24823c8683fd48768024795c996 (patch)
treea7098e96643c4a31c273133097f468c93ccd8cac /convert.c
parentc735ce4a1d6298028388299deaa10b1426c2e5fc (diff)
parent78e98eaf5ee49bc6d62ef9bdf87066528bfba248 (diff)
downloadgit-e927c1675171a24823c8683fd48768024795c996.tar.gz
Merge branch 'rs/diff-tree-combined-clean-up'
* rs/diff-tree-combined-clean-up: submodule: use diff_tree_combined_merge() instead of diff_tree_combined() pass struct commit to diff_tree_combined_merge() use struct sha1_array in diff_tree_combined()
Diffstat (limited to 'convert.c')
0 files changed, 0 insertions, 0 deletions