summaryrefslogtreecommitdiffstats
path: root/tests/resources/mergedrepo
ModeNameSize
d---------.gitted457logstatsplain
-rw-r--r--conflicts-one.txt93logstatsplain
-rw-r--r--conflicts-two.txt107logstatsplain
-rw-r--r--one.txt180logstatsplain
-rw-r--r--two.txt216logstatsplain