~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 5050.53.2.

More tests, more description of test intent, and specify exactly what happens with duplicate vs. different conflicts.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: