diff options
author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-12-17 01:07:08 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-12-16 17:41:41 -0800 |
commit | 2dbd00a7a1d625fd5763ea1e774ad62e5de8d7b3 (patch) | |
tree | 555467b409ec725ad28ac9dac2a0de852b410ef7 /t/t6417-merge-ours-theirs.sh | |
parent | t5703: use `main` as initial branch name (diff) | |
download | tgif-2dbd00a7a1d625fd5763ea1e774ad62e5de8d7b3.tar.xz |
t6302: use `main` as initial branch name
In 66713e84e71 (tests: prepare aligned mentions of the default branch
name, 2020-10-23), we started adjusting this test script for the default
initial branch name changing to `main`.
However, there is no need to wait for that: let's adjust the test script
to stop relying on a specific initial branch name by setting it
explicitly. This allows us to drop the `PREPARE_FOR_MAIN_BRANCH` prereq
from six test cases.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6417-merge-ours-theirs.sh')
0 files changed, 0 insertions, 0 deletions