t64*: preemptively adjust alignment to prepare for `master` -> `main`

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 <redacted>
Signed-off-by: Junio C Hamano <redacted>

diff --git a/t/t6416-recursive-corner-cases.sh b/t/t6416-recursive-corner-cases.sh
index 6a740771ed59d9a3e02bcfd741b8fd18ba1304f1..3d515a8e3159dd569035b7b452fe099a9460ca24 100755 (executable)
--- a/t/t6416-recursive-corner-cases.sh
+++ b/t/t6416-recursive-corner-cases.sh
@@ -388,7 +388,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
@@ -410,7 +410,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
@@ -1556,7 +1556,7 @@ test_expect_failure 'check conflicting modes for regular file' '
 # Setup:
 #          L1---L2
 #         /  \ /  \
-#   master    X    ?
+#     master    X    ?
 #         \  / \  /
 #          R1---R2
 #
@@ -1751,7 +1751,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 70c8af7f513b5676a7a305575ae2c5f8fdedb7aa..9fb4e72ca383ed93791d7d5822bf967fcdb46176 100755 (executable)
--- a/t/t6422-merge-rename-corner-cases.sh
+++ b/t/t6422-merge-rename-corner-cases.sh
@@ -1133,7 +1133,7 @@ test_conflicts_with_adds_and_renames() {
        # Setup:
        #          L
        #         / \
-       #   master   ?
+       #     master   ?
        #         \ /
        #          R
        #
@@ -1293,7 +1293,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 c192ee4e42810f7f628d62f6cbf6a8028987e5c5..3ae2d07ae18bbacf0b4b052f90345891f5b6c577 100755 (executable)
--- a/t/t6427-diff3-conflict-markers.sh
+++ b/t/t6427-diff3-conflict-markers.sh
@@ -46,7 +46,7 @@ test_expect_success 'check no merge base' '
 # Setup:
 #          L1
 #         /  \
-#   master    ?
+#     master    ?
 #         \  /
 #          R1
 #
@@ -104,7 +104,7 @@ test_expect_success 'check unique merge base' '
 # Setup:
 #          L1---L2--L3
 #         /  \ /      \
-#   master    X1       ?
+#     master    X1       ?
 #         \  / \      /
 #          R1---R2--R3
 #