summaryrefslogtreecommitdiff
path: root/tests/resources/merge-resolve/.gitted/refs
Commit message (Expand)AuthorAgeFilesLines
* Add `git_merge_status` to provide info about an upcoming mergeEdward Thomson2014-03-201-0/+1
* Merge submodulesEdward Thomson2014-01-203-0/+3
* Rename tests-clar to testsBen Straub2013-11-1444-0/+44