merge-recursive: align labels with their respective code blocks

diff --git a/builtin/difftool.c b/builtin/difftool.c
index c439b6420788c42f6cae248a97b642e698fd88dc..bc97d4aef2db2d76e3ffddfc4759e52688f3974e 100644 (file)
--- a/builtin/difftool.c
+++ b/builtin/difftool.c
@@ -610,7 +610,7 @@ static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix,
                        continue;
 
                if (!indices_loaded) {
-                       static struct lock_file lock;
+                       struct lock_file lock = LOCK_INIT;
                        strbuf_reset(&buf);
                        strbuf_addf(&buf, "%s/wtindex", tmpdir);
                        if (hold_lock_file_for_update(&lock, buf.buf, 0) < 0 ||