/tests-clar/resources/merge-resolve/

• ../
• .gitted
• added-in-master.txt
• automergeable.txt
• changed-in-branch.txt
• changed-in-master.txt
• conflicting.txt
• removed-in-branch.txt
• unchanged.txt