Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVasco Almeida <vascomalmeida@sapo.pt>2016-09-15 17:59:04 +0300
committerJunio C Hamano <gitster@pobox.com>2016-09-15 23:17:32 +0300
commit8d79589ad61132e038dd7312ab018c6d6518ead7 (patch)
treea8ba536214b3d4095edaacef36dacf071bd1f4d8 /t/t3320-notes-merge-worktrees.sh
parent2d1252dade6cdc32be071aabddc0b9fc5ca9af46 (diff)
notes: spell first word of error messages in lowercase
That's the usual style. Update one test to reflect these changes. 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-xt/t3320-notes-merge-worktrees.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3320-notes-merge-worktrees.sh b/t/t3320-notes-merge-worktrees.sh
index 6e0511596b..b9c3bc2487 100755
--- a/t/t3320-notes-merge-worktrees.sh
+++ b/t/t3320-notes-merge-worktrees.sh
@@ -52,7 +52,7 @@ test_expect_success 'merge z into y while mid-merge in another workdir fails' '
cd worktree &&
git config core.notesRef refs/notes/y &&
test_must_fail git notes merge z 2>err &&
- test_i18ngrep "A notes merge into refs/notes/y is already in-progress at" err
+ test_i18ngrep "a notes merge into refs/notes/y is already in-progress at" err
) &&
test_path_is_missing .git/worktrees/worktree/NOTES_MERGE_REF
'