pull: check if in unresolved merge state

diff --git a/lockfile.c b/lockfile.c
index 30e65e9d22566ada51cffb36642e0a27ea4507dc..5a93bc7bc2425bf01e88f55024854225d6a78aca 100644 (file)
--- a/lockfile.c
+++ b/lockfile.c
@@ -289,7 +289,7 @@ int hold_lock_file_for_append(struct lock_file *lk, const char *path, int flags)
                int save_errno = errno;
 
                if (flags & LOCK_DIE_ON_ERROR)
-                       exit(128);
+                       die("failed to prepare '%s' for appending", path);
                close(orig_fd);
                rollback_lock_file(lk);
                errno = save_errno;