diff options
| author | Vasco Almeida <vascomalmeida@sapo.pt> | 2016-06-17 23:21:14 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-06-18 01:45:49 +0300 |
| commit | 5313827f7eb5a54391da357ae01f2651fde28c8f (patch) | |
| tree | 0603bd96527c764a67c74c74fef941d869572e81 /t/t3320-notes-merge-worktrees.sh | |
| parent | 3c5077fe338c5af4f003e298267aa4071c125c8a (diff) | |
i18n: notes: mark strings for translation
Mark strings of messages for the user as translatable.
Update tests t3310-notes-merge-manual-resolve.sh and
t3320-notes-merge-worktrees.sh to reflect new translatable messages.
Tests that grep for .git/NOTES_MERGE_WORKTREE reflect the translatable
string "Automatic notes merge failed. Fix conflicts in %s and [...]".
Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3320-notes-merge-worktrees.sh')
| -rwxr-xr-x | t/t3320-notes-merge-worktrees.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3320-notes-merge-worktrees.sh b/t/t3320-notes-merge-worktrees.sh index 522157b764..6e0511596b 100755 --- a/t/t3320-notes-merge-worktrees.sh +++ b/t/t3320-notes-merge-worktrees.sh @@ -62,7 +62,7 @@ test_expect_success 'merge z into x while mid-merge on y succeeds' ' cd worktree2 && git config core.notesRef refs/notes/x && test_must_fail git notes merge z 2>&1 >out && - grep "Automatic notes merge failed" out && + test_i18ngrep "Automatic notes merge failed" out && grep -v "A notes merge into refs/notes/x is already in-progress in" out ) && echo "ref: refs/notes/x" >expect && |