Baptiste Daroussin
2cfca8e710
Make the merge mode compatible with GNU diff3 Add tests for all the changes, those tests are extracted from the etcupdate testsuite. This version passes the etcupdate testsuite and the diffutils diff3 test suite. MFC After: 1 week
4 lines
42 B
Plaintext
4 lines
42 B
Plaintext
this is an new line
|
|
|
|
this is a local line
|