summaryrefslogtreecommitdiff
path: root/tests-clar/resources/twowaymerge.git/description
Commit message (Expand)AuthorAgeFilesLines
* Rename tests-clar to testsBen Straub2013-11-141-1/+0
* Add the ahead/behind test that Carlos suggestedScott J. Goldman2012-11-281-0/+1