Philip Martin <philip.mar...@wandisco.com> writes: > But does cause 3 FAILs in merge_tests.py: > FAIL: merge_tests.py 34: conflict markers should match the file's eol style > FAIL: merge_tests.py 35: handle eol-style propchange during merge > FAIL: merge_tests.py 110: dav skelta mode can cause spurious conflicts
110 was spurious, I had other changes in my tree. -- Philip
