← Back to branch summary

~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 3021.

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-11-23 21:35:00 UTC
  • mfrom: (3017.2.2 revert)
  • Revision ID: pqm@pqm.ubuntu.com-20071123213500-mrqqeapz0f1mcfs3
Revert now resolves conflicts recursively (#102739)

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: