Replying to https://bugs.edge.launchpad.net/bzr/+bug/364305/comments/16, as a data point, bzr merge ../merge-source --preview
succeeds but the output contains: Contents conflict in mysql-test/suite/pbxt/r/type_varchar.result Contents conflict in mysql-test/suite/pbxt/t/type_varchar.test
=== added file 'mysql-test/suite/pbxt/r/type_varchar.result.OTHER'
and
=== added file 'mysql-test/suite/pbxt/t/type_varchar.test.OTHER'
Replying to https:/ /bugs.edge. launchpad. net/bzr/ +bug/364305/ comments/ 16, as a data point,
bzr merge ../merge-source --preview
succeeds but the output contains: suite/pbxt/ r/type_ varchar. result suite/pbxt/ t/type_ varchar. test
Contents conflict in mysql-test/
Contents conflict in mysql-test/
=== added file 'mysql- test/suite/ pbxt/r/ type_varchar. result. OTHER'
and
=== added file 'mysql- test/suite/ pbxt/t/ type_varchar. test.OTHER'