summaryrefslogtreecommitdiff
path: root/tests/resources/merge-resolve/.gitted/objects
Commit message (Expand)AuthorAgeFilesLines
* Do not attempt to check out submodule as blob when merging a submodule modify...David Turner2017-12-042-0/+2
* merge_trees: introduce test for submodule renamesEdward Thomson2017-02-0914-0/+5
* Merge submodulesEdward Thomson2014-01-2024-0/+6
* Don't try to merge binary filesEdward Thomson2014-01-209-0/+3
* Rename tests-clar to testsBen Straub2013-11-14309-0/+110