rerere: mention caveat about unmatched conflict markers

diff --git a/bundle.c b/bundle.c
index 902c9b54485be2000696a697472fa10d97b36153..160bbfdc64ec2876bdc685d253bf537d1c739c1f 100644 (file)
--- a/bundle.c
+++ b/bundle.c
@@ -409,7 +409,7 @@ static int write_bundle_refs(int bundle_fd, struct rev_info *revs)
 int create_bundle(struct bundle_header *header, const char *path,
                  int argc, const char **argv)
 {
-       static struct lock_file lock;
+       struct lock_file lock = LOCK_INIT;
        int bundle_fd = -1;
        int bundle_to_stdout;
        int ref_count = 0;