summaryrefslogtreecommitdiff
path: root/t/t6047-diff3-conflict-markers.sh
Commit message (Expand)AuthorAgeFilesLines
* 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