merge: add scissors line on merge conflict

diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c
index f6a513495ea77e4350aa6ec5282c3ab2969ee027..153a2bd282cac47ba72c101eaf0ca1b867d3f2cd 100644 (file)
--- a/builtin/fetch-pack.c
+++ b/builtin/fetch-pack.c
@@ -218,7 +218,8 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix)
 
        packet_reader_init(&reader, fd[0], NULL, 0,
                           PACKET_READ_CHOMP_NEWLINE |
-                          PACKET_READ_GENTLE_ON_EOF);
+                          PACKET_READ_GENTLE_ON_EOF |
+                          PACKET_READ_DIE_ON_ERR_PACKET);
 
        version = discover_version(&reader);
        switch (version) {