summaryrefslogtreecommitdiff
path: root/mergetools/tkdiff
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2020-11-18 23:44:22 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-11-19 15:44:18 -0800
commit883b98efade212bf1496a93dd8a691355a31daf0 (patch)
tree5a9c67eb117e5840725328bbfae9714d3b8e5eb0 /mergetools/tkdiff
parentt[01]*: adjust the references to the default branch name "main" (diff)
downloadtgif-883b98efade212bf1496a93dd8a691355a31daf0.tar.xz
t2*: adjust the references to the default branch name "main"
Carefully excluding t2106, which sees independent development elsewhere at the time of writing, we transition above-mentioned tests to the default branch name `main`. This trick was performed via $ (cd t && sed -i -e 's/master/main/g' -e 's/MASTER/MAIN/g' \ -e 's/Master/Main/g' -- t2*.sh && git checkout HEAD -- t2106\*) This allows us to define `GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main` for those tests. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/tkdiff')
0 files changed, 0 insertions, 0 deletions