summaryrefslogtreecommitdiff
path: root/t/t7606-merge-custom.sh
diff options
context:
space:
mode:
Diffstat (limited to 't/t7606-merge-custom.sh')
-rwxr-xr-xt/t7606-merge-custom.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7606-merge-custom.sh b/t/t7606-merge-custom.sh
index 8e8c4d7246..81fb7c474c 100755
--- a/t/t7606-merge-custom.sh
+++ b/t/t7606-merge-custom.sh
@@ -4,7 +4,7 @@ test_description="git merge
Testing a custom strategy.
-* (HEAD, master) Merge commit 'c3'
+* (HEAD, main) Merge commit 'c3'
|\
| * (tag: c3) c3
* | (tag: c1) c1