From c041c6d06a7fce3aa563d7b0c4a47feccc541400 Mon Sep 17 00:00:00 2001 From: Vasco Almeida Date: Mon, 19 Sep 2016 13:08:20 +0000 Subject: i18n: notes-merge: mark die messages for translation Update test to reflect changes. Signed-off-by: Vasco Almeida Signed-off-by: Junio C Hamano --- t/t3310-notes-merge-manual-resolve.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 't') diff --git a/t/t3310-notes-merge-manual-resolve.sh b/t/t3310-notes-merge-manual-resolve.sh index 6967436327..baef2d6924 100755 --- a/t/t3310-notes-merge-manual-resolve.sh +++ b/t/t3310-notes-merge-manual-resolve.sh @@ -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 -- cgit v1.2.3