← Back to branch summary

~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 5558.

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-12-03 08:31:44 UTC
  • mfrom: (4597.14.11 638451-malformed)
  • Revision ID: pqm@pqm.ubuntu.com-20101203083144-b2qfwgifwp1wq6zv
(vila) Implement resolve --take-this and --take-other for text conflicts.
 (Vincent Ladeuil)

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: