summaryrefslogtreecommitdiff
path: root/tests/merge/files.c
Commit message (Expand)AuthorAgeFilesLines
* Introduce git_merge_file for consumersEdward Thomson2014-03-201-0/+175