/test/integration/mergeConflicts/

• ../
• config
• expected
• recording.json
• setup.sh
• test.json