summaryrefslogtreecommitdiff
path: root/t/t6417-merge-ours-theirs.sh
AgeCommit message (Expand)AuthorFilesLines
2020-08-10Collect merge-related tests to t64xxLibravatar Elijah Newren1-0/+108
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 14:40:31 +0000