← Back to branch summary

~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 4322.

(jam) Update 'bzr merge --weave' to generate conflicts when one side
        modifies and one side deletes a line. (bug #328171)

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: