diff options
| author |  Vasco Almeida <vascomalmeida@sapo.pt> | 2016-09-19 13:08:20 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-09-21 10:20:43 -0700 |
| commit | c041c6d06a7fce3aa563d7b0c4a47feccc541400 (patch) | |
| tree | 8050a5106689367cedd8d2e08d45378de96c3962 /t | |
| parent | i18n: ident: mark hint for translation (diff) | |
| download | tgif-c041c6d06a7fce3aa563d7b0c4a47feccc541400.tar.xz | |
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 't')
| -rwxr-xr-x | t/t3310-notes-merge-manual-resolve.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 |