Merge branch 'rs/diff-tree-combined-clean-up' into next
commit265e0491757f2b49fcba1e57561f11e718d46781
authorJunio C Hamano <gitster@pobox.com>
Tue, 20 Dec 2011 21:40:55 +0000 (20 13:40 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 20 Dec 2011 21:40:55 +0000 (20 13:40 -0800)
tree0a9bdb57a1bc5dec1f0d5be82dc13ba69e4e3888
parentb79f101e9da38d2ed2fb6784a8bc1fd1f7aa3689
parent78e98eaf5ee49bc6d62ef9bdf87066528bfba248
Merge branch 'rs/diff-tree-combined-clean-up' into next

* 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()