summaryrefslogtreecommitdiff
path: root/t/t6047-diff3-conflict-markers.sh
AgeCommit message (Expand)AuthorFilesLines
2020-02-16rebase: rename the two primary rebase backendsLibravatar Elijah Newren1-2/+2
2020-02-16rebase tests: repeat some tests using the merge backend instead of amLibravatar Elijah Newren1-2/+11
2019-10-02merge-recursive: fix the diff3 common ancestor label for virtual commitsLibravatar Elijah Newren1-0/+13
2019-08-19merge-recursive: provide a better label for diff3 common ancestorLibravatar Elijah Newren1-0/+189