summaryrefslogtreecommitdiff
path: root/builtin/pull.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-07-13 18:24:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-07-13 18:24:10 (GMT)
commit2703572b3a005848ed058d2775fb933a17ac3656 (patch)
tree8e4d016d4f8eb1975fb2b2325bdafd5ca74cd40f /builtin/pull.c
parentb1ec08fda8e0c3ed19b680404770ca4ec313ca8c (diff)
parent415c7dd026e4649bea48c35ccbe29d2fa8b69be5 (diff)
downloadgit-2703572b3a005848ed058d2775fb933a17ac3656.zip
git-2703572b3a005848ed058d2775fb933a17ac3656.tar.gz
git-2703572b3a005848ed058d2775fb933a17ac3656.tar.bz2
Merge branch 'va/i18n-even-more'
More markings of messages for i18n, with updates to various tests to pass GETTEXT_POISON tests. One patch from the original submission dropped due to conflicts with jk/upload-pack-hook, which is still in flux. * va/i18n-even-more: (38 commits) t5541: become resilient to GETTEXT_POISON i18n: branch: mark comment when editing branch description for translation i18n: unmark die messages for translation i18n: submodule: escape shell variables inside eval_gettext i18n: submodule: join strings marked for translation i18n: init-db: join message pieces i18n: remote: allow translations to reorder message i18n: remote: mark URL fallback text for translation i18n: standardise messages i18n: sequencer: add period to error message i18n: merge: change command option help to lowercase i18n: merge: mark messages for translation i18n: notes: mark options for translation i18n: notes: mark strings for translation i18n: transport-helper.c: change N_() call to _() i18n: bisect: mark strings for translation t5523: use test_i18ngrep for negation t4153: fix negated test_i18ngrep call t9003: become resilient to GETTEXT_POISON tests: unpack-trees: update to use test_i18n* functions ...
Diffstat (limited to 'builtin/pull.c')
-rw-r--r--builtin/pull.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/pull.c b/builtin/pull.c
index 897a7f4..398aae1 100644
--- 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();