summaryrefslogtreecommitdiff
path: root/t/lib/merge/Foo
ModeNameSize
-rw-r--r--Conflicts.pm246logplain
-rw-r--r--Conflicts2.pm195logplain