summaryrefslogtreecommitdiff
path: root/tests-clar/merge/setup.c
Commit message (Expand)AuthorAgeFilesLines
* merge!Edward Thomson2013-04-301-139/+0
* clar: fix merge/setup.cclar2Vicent Marti2013-01-041-21/+1
* MERGE_HEAD contents iteratorEdward Thomson2013-01-041-0/+159