summaryrefslogtreecommitdiff
path: root/notes-merge.c
diff options
context:
space:
mode:
authorVasco Almeida <vascomalmeida@sapo.pt>2016-09-19 13:08:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-09-21 17:20:43 (GMT)
commitc041c6d06a7fce3aa563d7b0c4a47feccc541400 (patch)
tree8050a5106689367cedd8d2e08d45378de96c3962 /notes-merge.c
parent166e55e328a5b303031140f758a0463df331777a (diff)
downloadgit-c041c6d06a7fce3aa563d7b0c4a47feccc541400.zip
git-c041c6d06a7fce3aa563d7b0c4a47feccc541400.tar.gz
git-c041c6d06a7fce3aa563d7b0c4a47feccc541400.tar.bz2
i18n: notes-merge: mark die messages for translation
Update test to reflect changes. Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'notes-merge.c')
-rw-r--r--notes-merge.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/notes-merge.c b/notes-merge.c
index 97fc42f..3bbeb86 100644
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -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_*"));
else
- 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(