summaryrefslogtreecommitdiff
path: root/tests-clar/resources/merge-resolve/.gitted/objects
Commit message (Expand)AuthorAgeFilesLines
* Rename tests-clar to testsBen Straub2013-11-14309-110/+0
* tests for checkout index with conflictsEdward Thomson2013-10-163-0/+0
* merge!Edward Thomson2013-04-30306-0/+110