~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 6416.

  • Committer: Patch Queue Manager
  • Date: 2012-01-03 13:21:09 UTC
  • mfrom: (6410.1.1 propagate-other-branch)
  • Revision ID: pqm@pqm.ubuntu.com-20120103132109-12fugun039vg5r6v
(jelmer) Add an "other_branch" argument to Merge3Merger.
 (Jelmer Vernooij)

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: