aboutsummaryrefslogtreecommitdiff
path: root/merge-index.c
diff options
context:
space:
mode:
Diffstat (limited to 'merge-index.c')
-rw-r--r--merge-index.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/merge-index.c b/merge-index.c
index 727527fd5..024196e7a 100644
--- a/merge-index.c
+++ b/merge-index.c
@@ -102,6 +102,7 @@ int main(int argc, char **argv)
if (argc < 3)
usage("git-merge-index [-o] [-q] <merge-program> (-a | <filename>*)");
+ setup_git_directory();
read_cache();
i = 1;