summaryrefslogtreecommitdiffstats
path: root/t/02-conflicts.t
Commit message (Expand)AuthorAgeFilesLines
* update tests to check for runtime warningsJesse Luehrs2011-01-131-2/+26
* initial implementationJesse Luehrs2010-11-211-0/+70