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