mergetool: Provide an empty file when needed

[git.git] / tree-walk.c

diff --git a/tree-walk.c b/tree-walk.c
index 808bb55ba3f21d113e6358f6874e2e20cb33bbea..a8d8a66d597f54e3a99a4c3e9615330eb7a7fe1a 100644 (file)
--- a/tree-walk.c
+++ b/tree-walk.c
@@ -344,7 +344,7 @@ int traverse_trees(int n, struct tree_desc *t, struct traverse_info *info)
                unsigned long mask, dirmask;
                const char *first = NULL;
                int first_len = 0;
-               struct name_entry *e;
+               struct name_entry *e = NULL;
                int len;
 
                for (i = 0; i < n; i++) {