summaryrefslogtreecommitdiff
path: root/tests-clar/resources/merge-resolve
ModeNameSize
d---------.gitted313logplain
-rw-r--r--added-in-master.txt29logplain
-rw-r--r--automergeable.txt247logplain
-rw-r--r--changed-in-branch.txt17logplain
-rw-r--r--changed-in-master.txt18logplain
-rw-r--r--conflicting.txt42logplain
-rw-r--r--removed-in-branch.txt26logplain
-rw-r--r--unchanged.txt31logplain