summaryrefslogtreecommitdiff
path: root/tests/resources/merge-recursive/asparagus.txt
Commit message (Expand)AuthorAgeFilesLines
* merge tests: add complex recursive exampleEdward Thomson2015-11-251-1/+1
* merge: add simple recursive testEdward Thomson2015-11-251-0/+10