Merge branch 'da/mergetool-temporary-filename'

diff --git a/builtin/mailsplit.c b/builtin/mailsplit.c
index 763cda098cf1e2ac2ccbae45d3602f8bb1093be0..8e02ea109ac8f9fd739c4d54b7a709916f88022a 100644 (file)
--- a/builtin/mailsplit.c
+++ b/builtin/mailsplit.c
@@ -59,7 +59,6 @@ static int split_one(FILE *mbox, const char *name, int allow_bare)
        int is_bare = !is_from_line(buf.buf, buf.len);
 
        if (is_bare && !allow_bare) {
-               unlink(name);
                fprintf(stderr, "corrupt mailbox\n");
                exit(1);
        }