diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-30 11:09:33 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-30 11:09:33 -0800 |
| commit | 9cac9d368934f68e75810df95211a6522d4d139e (patch) | |
| tree | 6587296cef3998501dd38886d20e80cfd84342ff /merge-index.c | |
| parent | 5401f3040b61e11da79d676e42aacfa9f1131083 (diff) | |
| parent | 99e01692063cc48adee19e1f738472a579c14ca2 (diff) | |
| download | git-9cac9d368934f68e75810df95211a6522d4d139e.tar.gz | |
Merge branch 'jc/subdir'
Diffstat (limited to 'merge-index.c')
| -rw-r--r-- | merge-index.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/merge-index.c b/merge-index.c index 727527fd59..024196e7ac 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; |