/tests/resources/mergedrepo/

• ../
• .gitted
• conflicts-one.txt
• conflicts-two.txt
• one.txt
• two.txt