~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 1711.2.72.

Update test_remerge with new api, and minor fixes.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: