Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
t9003: become resilient to GETTEXT_POISON
[gitweb.git]
/
builtin
/
pull.c
diff --git
a/builtin/pull.c
b/builtin/pull.c
index 1d7333c8a11f7aedf244c99f5ac67bea7fccaab4..a980dcfe9b28e40402be6227e6fb5531f77e6a77 100644
(file)
--- a/
builtin/pull.c
+++ b/
builtin/pull.c
@@
-852,7
+852,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("
P
ull");
+ die_resolve_conflict("
p
ull");
if (file_exists(git_path("MERGE_HEAD")))
die_conclude_merge();