test::a binary file's conflict offers each side, then the working copy's version

Tests on main · the last 2 runs: 2 passed