merge-recursive: do not rudely die on binary merge

diff --git a/match-trees.c b/match-trees.c
index 23cafe47b495ba40fbdd46eb35943be5f722a1d7..d7e29c4d1d3e44c85e0eeb28040e8ea945090594 100644 (file)
--- a/match-trees.c
+++ b/match-trees.c
@@ -301,4 +301,3 @@ void shift_tree(const unsigned char *hash1,
 
        splice_tree(hash1, add_prefix, hash2, shifted);
 }
-