summaryrefslogtreecommitdiffstats
path: root/t/t6047-diff3-conflict-markers.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* rebase: rename the two primary rebase backendsElijah Newren2020-02-171-2/+2
* rebase tests: repeat some tests using the merge backend instead of amElijah Newren2020-02-171-2/+11
* merge-recursive: fix the diff3 common ancestor label for virtual commitsElijah Newren2019-10-021-0/+13
* merge-recursive: provide a better label for diff3 common ancestorElijah Newren2019-08-191-0/+189