summaryrefslogtreecommitdiffstats
path: root/tests/resources/merge-resolve
ModeNameSize
d---------.gitted347logstatsplain
-rw-r--r--added-in-master.txt29logstatsplain
-rw-r--r--automergeable.txt247logstatsplain
-rw-r--r--changed-in-branch.txt17logstatsplain
-rw-r--r--changed-in-master.txt18logstatsplain
-rw-r--r--conflicting.txt42logstatsplain
-rw-r--r--removed-in-branch.txt26logstatsplain
-rw-r--r--unchanged.txt31logstatsplain