diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-11-19 02:44:37 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-20 02:44:18 +0300 |
| commit | 1f53df54eba378eee544b47f7c9e7f5fc32873e1 (patch) | |
| tree | 0bc9595b97c52431034f4871beac56e1364b1e14 /t/t6427-diff3-conflict-markers.sh | |
| parent | 1550bb6ed0055895fe90a8b1eda95408ddf0d813 (diff) | |
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>
Diffstat (limited to 't/t6427-diff3-conflict-markers.sh')
| -rwxr-xr-x | t/t6427-diff3-conflict-markers.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t6427-diff3-conflict-markers.sh b/t/t6427-diff3-conflict-markers.sh index c192ee4e42..3ae2d07ae1 100755 --- 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 # |