diff options
| author | Vasco Almeida <vascomalmeida@sapo.pt> | 2016-09-19 13:08:20 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-21 17:20:43 (GMT) |
| commit | c041c6d06a7fce3aa563d7b0c4a47feccc541400 (patch) | |
| tree | 8050a5106689367cedd8d2e08d45378de96c3962 /t/t3310-notes-merge-manual-resolve.sh | |
| parent | 166e55e328a5b303031140f758a0463df331777a (diff) | |
| download | git-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 't/t3310-notes-merge-manual-resolve.sh')
| -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 6967436..baef2d6 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 |