t64*: preemptively adjust alignment to prepare for `master` -> `main`
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Wed, 18 Nov 2020 23:44:37 +0000 (23:44 +0000)
committerJunio C Hamano <gitster@pobox.com>
Thu, 19 Nov 2020 23:44:18 +0000 (15:44 -0800)
commit1f53df54eba378eee544b47f7c9e7f5fc32873e1
tree0bc9595b97c52431034f4871beac56e1364b1e14
parent1550bb6ed0055895fe90a8b1eda95408ddf0d813
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>
t/t6416-recursive-corner-cases.sh
t/t6422-merge-rename-corner-cases.sh
t/t6427-diff3-conflict-markers.sh