mirror of
https://github.com/git/git.git
synced 2026-01-18 06:34:21 +00:00
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>
25 KiB
25 KiB