Sync with 1.8.1.3

[git.git] / builtin / merge-index.c

diff --git a/builtin/merge-index.c b/builtin/merge-index.c
index 23388325879c5a52a4a8c25f254aafe23573e820..be5e514324aba1d50d8afe653dd72ccc5db060d8 100644 (file)
--- a/builtin/merge-index.c
+++ b/builtin/merge-index.c
@@ -42,7 +42,7 @@ static int merge_entry(int pos, const char *path)
        return found;
 }
 
-static void merge_file(const char *path)
+static void merge_one_path(const char *path)
 {
        int pos = cache_name_pos(path, strlen(path));
 
@@ -102,7 +102,7 @@ int cmd_merge_index(int argc, const char **argv, const char *prefix)
                        }
                        die("git merge-index: unknown option %s", arg);
                }
-               merge_file(arg);
+               merge_one_path(arg);
        }
        if (err && !quiet)
                die("merge program failed");