freshlybakedca.ke / git
Git fork
fork atom

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>

authored by

Johannes Schindelin and committed by
Junio C Hamano 1f53df54 1550bb6e

+8 -8
unified split
+4 -4
t/t6416-recursive-corner-cases.sh
··· 388 test_line_count = 2 out && 389 390 git rev-parse >expect \ 391 - master:file B:file && 392 git rev-parse >actual \ 393 :1:file :2:file && 394 test_cmp expect actual ··· 410 test_line_count = 2 out && 411 412 git rev-parse >expect \ 413 - master:file B:file && 414 git rev-parse >actual \ 415 :1:file :3:file && 416 test_cmp expect actual ··· 1556 # Setup: 1557 # L1---L2 1558 # / \ / \ 1559 - # master X ? 1560 # \ / \ / 1561 # R1---R2 1562 # ··· 1751 # Setup: 1752 # L1---L2---L3 1753 # / \ / \ / \ 1754 - # master X1 X2 ? 1755 # \ / \ / \ / 1756 # R1---R2---R3 1757 #
··· 388 test_line_count = 2 out && 389 390 git rev-parse >expect \ 391 + master:file B:file && 392 git rev-parse >actual \ 393 :1:file :2:file && 394 test_cmp expect actual ··· 410 test_line_count = 2 out && 411 412 git rev-parse >expect \ 413 + master:file B:file && 414 git rev-parse >actual \ 415 :1:file :3:file && 416 test_cmp expect actual ··· 1556 # Setup: 1557 # L1---L2 1558 # / \ / \ 1559 + # master X ? 1560 # \ / \ / 1561 # R1---R2 1562 # ··· 1751 # Setup: 1752 # L1---L2---L3 1753 # / \ / \ / \ 1754 + # master X1 X2 ? 1755 # \ / \ / \ / 1756 # R1---R2---R3 1757 #
+2 -2
t/t6422-merge-rename-corner-cases.sh
··· 1133 # Setup: 1134 # L 1135 # / \ 1136 - # master ? 1137 # \ / 1138 # R 1139 # ··· 1293 # Setup: 1294 # L 1295 # / \ 1296 - # master ? 1297 # \ / 1298 # R 1299 #
··· 1133 # Setup: 1134 # L 1135 # / \ 1136 + # master ? 1137 # \ / 1138 # R 1139 # ··· 1293 # Setup: 1294 # L 1295 # / \ 1296 + # master ? 1297 # \ / 1298 # R 1299 #
+2 -2
t/t6427-diff3-conflict-markers.sh
··· 46 # Setup: 47 # L1 48 # / \ 49 - # master ? 50 # \ / 51 # R1 52 # ··· 104 # Setup: 105 # L1---L2--L3 106 # / \ / \ 107 - # master X1 ? 108 # \ / \ / 109 # R1---R2--R3 110 #
··· 46 # Setup: 47 # L1 48 # / \ 49 + # master ? 50 # \ / 51 # R1 52 # ··· 104 # Setup: 105 # L1---L2--L3 106 # / \ / \ 107 + # master X1 ? 108 # \ / \ / 109 # R1---R2--R3 110 #