![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | René Scharfe <rene.scharfe@lsrfire.ath.cx> | |
| Sat, 17 Dec 2011 10:27:19 +0000 (11:27 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 18 Dec 2011 02:23:24 +0000 (18:23 -0800) | ||
| commit | 78e98eaf5ee49bc6d62ef9bdf87066528bfba248 | |
| tree | fee05f1eab7498d0bac3271986185bd80fc2b8d4 | tree | snapshot |
| parent | 82889295e76200714d76e0f7beb07b6b9e3b5a88 | commit | diff |
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>
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 | diff | blob | history |