summaryrefslogtreecommitdiff
path: root/tests/resources/merge-resolve
Commit message (Expand)AuthorAgeFilesLines
* Add `git_merge_status` to provide info about an upcoming mergeEdward Thomson2014-03-201-0/+1
* Merge submodulesEdward Thomson2014-01-2045-0/+44
* Don't try to merge binary filesEdward Thomson2014-01-209-0/+3
* Rename tests-clar to testsBen Straub2013-11-14408-0/+538