diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-12-03 23:46:02 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-12-03 23:46:02 -0800 |
| commit | 423325a2d24638ddcc82ce47be5e40be550f4507 (patch) | |
| tree | 00960b001d786299d3da04a4467bd0c798bf8cda /merge-index.c | |
| parent | 93dcab2937624ebb97f91807576cddb242a55a46 (diff) | |
| parent | d79374c7b58d3814ffdc277de608243f8e665e3a (diff) | |
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; |