Commit c041c6d0 authored by Vasco Almeida's avatar Vasco Almeida Committed by Junio C Hamano

i18n: notes-merge: mark die messages for translation

Update test to reflect changes.
Signed-off-by: default avatarVasco Almeida <>
Signed-off-by: default avatarJunio C Hamano <>
parent 166e55e3
......@@ -269,15 +269,15 @@ static void check_notes_merge_worktree(struct notes_merge_options *o)
if (file_exists(git_path(NOTES_MERGE_WORKTREE)) &&
!is_empty_dir(git_path(NOTES_MERGE_WORKTREE))) {
if (advice_resolve_conflict)
die("You have not concluded your previous "
die(_("You have not concluded your previous "
"notes merge (%s exists).\nPlease, use "
"'git notes merge --commit' or 'git notes "
"merge --abort' to commit/abort the "
"previous merge before you start a new "
"notes merge.", git_path("NOTES_MERGE_*"));
"notes merge."), git_path("NOTES_MERGE_*"));
die("You have not concluded your notes merge "
"(%s exists).", git_path("NOTES_MERGE_*"));
die(_("You have not concluded your notes merge "
"(%s exists)."), git_path("NOTES_MERGE_*"));
if (safe_create_leading_directories_const(git_path(
......@@ -225,7 +225,7 @@ test_expect_success 'cannot do merge w/conflicts when previous merge is unfinish
test -d .git/NOTES_MERGE_WORKTREE &&
test_must_fail git notes merge z >output 2>&1 &&
# Output should indicate what is wrong
grep -q "\\.git/NOTES_MERGE_\\* exists" output
test_i18ngrep -q "\\.git/NOTES_MERGE_\\* exists" output
# Setup non-conflicting merge between x and new notes ref w
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment