Merge branch 'rs/diff-tree-combined-clean-up'
authorJunio C Hamano <gitster@pobox.com>
Thu, 22 Dec 2011 19:27:29 +0000 (11:27 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 22 Dec 2011 19:27:29 +0000 (11:27 -0800)
* 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()

Trivial merge