Files
arbiter/tests/fixtures/conflict-overlapping.diff