summaryrefslogtreecommitdiff
path: root/tests-clar/resources/merge-resolve/.gitted/refs/heads/trivial-6-branch
Commit message (Expand)AuthorAgeFilesLines
* merge!Edward Thomson2013-04-301-0/+1