New tests for round-trip fidelity of merge conflicts resolved using one parent.
First one currently fails.
Showing
tests/test-conflict-1
0 → 100755
tests/test-conflict-1.out
0 → 100644
tests/test-conflict-2
0 → 100755
tests/test-conflict-2.out
0 → 100644
Please register or sign in to comment