~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/multiparent.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-11-29 00:22:51 UTC
  • mfrom: (3040.2.3 164443-hpss-branch)
  • Revision ID: pqm@pqm.ubuntu.com-20071129002251-zx5sh1lk79tfebhf
Give a better message when failing to pull because the source needs to be reconciled (#164443)

Show diffs side-by-side

added added

removed removed

Lines of Context: