diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-07-21 09:49:35 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-23 20:19:10 +0200 |
| commit | 661558f0a58fc979c9c5fc1b720e48dfe23ef833 (patch) | |
| tree | eeb30324725b449b65f03c4c74bef72645acd459 /t/t3310-notes-merge-manual-resolve.sh | |
| parent | pkt-line.c: mark more strings for translation (diff) | |
| download | git-661558f0a58fc979c9c5fc1b720e48dfe23ef833.tar.xz git-661558f0a58fc979c9c5fc1b720e48dfe23ef833.zip | |
refs.c: mark more strings for translation
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t3310-notes-merge-manual-resolve.sh b/t/t3310-notes-merge-manual-resolve.sh index 9c1bf6eb3d..68436eed82 100755 --- a/t/t3310-notes-merge-manual-resolve.sh +++ b/t/t3310-notes-merge-manual-resolve.sh @@ -541,9 +541,9 @@ EOF test "$(git rev-parse refs/notes/y)" = "$(git rev-parse NOTES_MERGE_PARTIAL^1)" && test "$(git rev-parse refs/notes/m)" != "$(git rev-parse NOTES_MERGE_PARTIAL^1)" && # Mention refs/notes/m, and its current and expected value in output - grep -q "refs/notes/m" output && - grep -q "$(git rev-parse refs/notes/m)" output && - grep -q "$(git rev-parse NOTES_MERGE_PARTIAL^1)" output && + test_i18ngrep -q "refs/notes/m" output && + test_i18ngrep -q "$(git rev-parse refs/notes/m)" output && + test_i18ngrep -q "$(git rev-parse NOTES_MERGE_PARTIAL^1)" output && # Verify that other notes refs has not changed (w, x, y and z) verify_notes w && verify_notes x && |