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 <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Nov 18, 2020 at 23:44 UTC
1f53df54eba378eee544b47f7c9e7f5fc32873e1
3 files changed
+8
-8
t/t6416-recursive-corner-cases.sh
+4
-4
@@ -388,7 +388,7 @@ test_expect_success 'git detects conflict merging criss-cross+modify/delete' '
388
test_line_count = 2 out &&
389
390
git rev-parse >expect \
391
- master:file B:file &&
391
+ master:file B:file &&
392
git rev-parse >actual \
393
:1:file :2:file &&
394
test_cmp expect actual
@@ -410,7 +410,7 @@ test_expect_success 'git detects conflict merging criss-cross+modify/delete, rev
410
test_line_count = 2 out &&
411
412
git rev-parse >expect \
413
- master:file B:file &&
413
+ master:file B:file &&
414
git rev-parse >actual \
415
:1:file :3:file &&
416
test_cmp expect actual
@@ -1556,7 +1556,7 @@ test_expect_failure 'check conflicting modes for regular file' '
1556
# Setup:
1557
# L1---L2
1558
# / \ / \
1559
-# master X ?
1559
+# master X ?
1560
# \ / \ /
1561
# R1---R2
1562
#
@@ -1751,7 +1751,7 @@ test_expect_success 'check nested conflicts' '
1751
# Setup:
1752
# L1---L2---L3
1753
# / \ / \ / \
1754
-# master X1 X2 ?
1754
+# master X1 X2 ?
1755
# \ / \ / \ /
1756
# R1---R2---R3
1757
#
t/t6422-merge-rename-corner-cases.sh
+2
-2
@@ -1133,7 +1133,7 @@ test_conflicts_with_adds_and_renames() {
1133
# Setup:
1134
# L
1135
# / \
1136
- # master ?
1136
+ # master ?
1137
# \ /
1138
# R
1139
#
@@ -1293,7 +1293,7 @@ test_conflicts_with_adds_and_renames add add
1293
# Setup:
1294
# L
1295
# / \
1296
-# master ?
1296
+# master ?
1297
# \ /
1298
# R
1299
#
t/t6427-diff3-conflict-markers.sh
+2
-2
@@ -46,7 +46,7 @@ test_expect_success 'check no merge base' '
46
# Setup:
47
# L1
48
# / \
49
-# master ?
49
+# master ?
50
# \ /
51
# R1
52
#
@@ -104,7 +104,7 @@ test_expect_success 'check unique merge base' '
104
# Setup:
105
# L1---L2--L3
106
# / \ / \
107
-# master X1 ?
107
+# master X1 ?
108
# \ / \ /
109
# R1---R2--R3
110
#