From: Johannes Schindelin <johannes.schindelin@xxxxxx>
We are in the process of renaming the default branch name to `main`,
which is two characters shorter than `master`. Therefore, some lines
need to be adjusted in t6416, t6422 and t6427 that want to align text
involving the default branch name.
Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx>
---
t/t6416-recursive-corner-cases.sh | 8 ++++----
t/t6422-merge-rename-corner-cases.sh | 4 ++--
t/t6427-diff3-conflict-markers.sh | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/t/t6416-recursive-corner-cases.sh b/t/t6416-recursive-corner-cases.sh
index 887c2195a9..dbccc3158a 100755
--- a/t/t6416-recursive-corner-cases.sh
+++ b/t/t6416-recursive-corner-cases.sh
@@ -385,7 +385,7 @@ test_expect_success 'git detects conflict merging criss-cross+modify/delete' '
test_line_count = 2 out &&
git rev-parse >expect \
- master:file B:file &&
+ master:file B:file &&
git rev-parse >actual \
:1:file :2:file &&
test_cmp expect actual
@@ -407,7 +407,7 @@ test_expect_success 'git detects conflict merging criss-cross+modify/delete, rev
test_line_count = 2 out &&
git rev-parse >expect \
- master:file B:file &&
+ master:file B:file &&
git rev-parse >actual \
:1:file :3:file &&
test_cmp expect actual
@@ -1553,7 +1553,7 @@ test_expect_failure 'check conflicting modes for regular file' '
# Setup:
# L1---L2
# / \ / \
-# master X ?
+# master X ?
# \ / \ /
# R1---R2
#
@@ -1748,7 +1748,7 @@ test_expect_success 'check nested conflicts' '
# Setup:
# L1---L2---L3
# / \ / \ / \
-# master X1 X2 ?
+# master X1 X2 ?
# \ / \ / \ /
# R1---R2---R3
#
diff --git a/t/t6422-merge-rename-corner-cases.sh b/t/t6422-merge-rename-corner-cases.sh
index 78bfaf17f0..e40a1b686f 100755
--- a/t/t6422-merge-rename-corner-cases.sh
+++ b/t/t6422-merge-rename-corner-cases.sh
@@ -1130,7 +1130,7 @@ test_conflicts_with_adds_and_renames() {
# Setup:
# L
# / \
- # master ?
+ # master ?
# \ /
# R
#
@@ -1290,7 +1290,7 @@ test_conflicts_with_adds_and_renames add add
# Setup:
# L
# / \
-# master ?
+# master ?
# \ /
# R
#
diff --git a/t/t6427-diff3-conflict-markers.sh b/t/t6427-diff3-conflict-markers.sh
index f4655bb358..f7620e677c 100755
--- a/t/t6427-diff3-conflict-markers.sh
+++ b/t/t6427-diff3-conflict-markers.sh
@@ -43,7 +43,7 @@ test_expect_success 'check no merge base' '
# Setup:
# L1
# / \
-# master ?
+# master ?
# \ /
# R1
#
@@ -101,7 +101,7 @@ test_expect_success 'check unique merge base' '
# Setup:
# L1---L2--L3
# / \ / \
-# master X1 ?
+# master X1 ?
# \ / \ /
# R1---R2--R3
#
--
gitgitgadget
