submodule: use diff_tree_combined_merge() instead of diff_tree_combined()
authorRené Scharfe <rene.scharfe@lsrfire.ath.cx>
Sat, 17 Dec 2011 10:27:19 +0000 (11:27 +0100)
committerJunio C Hamano <gitster@pobox.com>
Sun, 18 Dec 2011 02:23:24 +0000 (18:23 -0800)
commit78e98eaf5ee49bc6d62ef9bdf87066528bfba248
treefee05f1eab7498d0bac3271986185bd80fc2b8d4
parent82889295e76200714d76e0f7beb07b6b9e3b5a88
submodule: use diff_tree_combined_merge() instead of diff_tree_combined()

Use diff_tree_combined_merge() instead of open-coding it.

Signed-off-by: René Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
submodule.c