summaryrefslogtreecommitdiff
path: root/t/t6047-diff3-conflict-markers.sh
AgeCommit message (Expand)Author
2020-08-10Collect merge-related tests to t64xxElijah Newren
2020-02-16rebase: rename the two primary rebase backendsElijah Newren
2020-02-16rebase tests: repeat some tests using the merge backend instead of amElijah Newren
2019-10-02merge-recursive: fix the diff3 common ancestor label for virtual commitsElijah Newren
2019-08-19merge-recursive: provide a better label for diff3 common ancestorElijah Newren