summaryrefslogtreecommitdiff
path: root/t/t6402-merge-rename.sh
AgeCommit message (Expand)AuthorFilesLines
2021-10-12Merge branch 'en/pull-conflicting-options' into maintLibravatar Junio C Hamano1-9/+9
2021-07-22pull: abort by default when fast-forwarding is not possibleLibravatar Elijah Newren1-9/+9
2021-07-06t6402: preserve git exit status codeLibravatar Đoàn Trần Công Danh1-68/+64
2020-11-19t6[4-9]*: adjust the references to the default branch name "main"Libravatar Johannes Schindelin1-24/+24
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Libravatar Johannes Schindelin1-0/+3
2020-10-26merge tests: expect slight differences in output for recursive vs. ortLibravatar Elijah Newren1-2/+12
2020-10-26merge tests: expect improved directory/file conflict handling in ortLibravatar Elijah Newren1-27/+81
2020-08-10Collect merge-related tests to t64xxLibravatar Elijah Newren1-0/+910