Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
i18n: git-merge "Updating %s..%s" message
[gitweb.git]
/
builtin
/
merge.c
diff --git
a/builtin/merge.c
b/builtin/merge.c
index 0be4dfadf8324e3edb78972f3d3ef1260700de57..4f6b34f23c5eb83c87f7cdbb14b6c3eb21524c16 100644
(file)
--- a/
builtin/merge.c
+++ b/
builtin/merge.c
@@
-1124,7
+1124,7
@@
int cmd_merge(int argc, const char **argv, const char *prefix)
strcpy(hex, find_unique_abbrev(head, DEFAULT_ABBREV));
if (verbosity >= 0)
- printf(
"Updating %s..%s\n"
,
+ printf(
_("Updating %s..%s\n")
,
hex,
find_unique_abbrev(remoteheads->item->object.sha1,
DEFAULT_ABBREV));