merge-recursive: do not rudely die on binary merge

diff --git a/builtin-shortlog.c b/builtin-shortlog.c
index 8d3f742d432c966e5afe03e8d0628eb92a73920c..16af6199ab2bc8a663d16f78a5d461a5bee05bc7 100644 (file)
--- a/builtin-shortlog.c
+++ b/builtin-shortlog.c
@@ -331,4 +331,3 @@ int cmd_shortlog(int argc, const char **argv, const char *prefix)
 
        return 0;
 }
-