usage: add set_warn_routine()

diff --git a/builtin/pull.c b/builtin/pull.c
index 897a7f4e4e040089b4021a9a0e217fbb63e7c6ec..398aae16c006f5386ba6d65e3ef266b4ddfe1e74 100644 (file)
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -855,7 +855,7 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
        git_config(git_pull_config, NULL);
 
        if (read_cache_unmerged())
-               die_resolve_conflict("Pull");
+               die_resolve_conflict("pull");
 
        if (file_exists(git_path("MERGE_HEAD")))
                die_conclude_merge();