~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/inventory.py

  • Committer: Aaron Bentley
  • Date: 2005-09-26 15:03:16 UTC
  • mto: (1185.14.1) (1393.1.21)
  • mto: This revision was merged to the branch mainline in revision 1391.
  • Revision ID: abentley@panoramicfeedback.com-20050926150316-ed498650ab07a6ce
Fixed bug where pull throws DivergedBranches if branch is newer than upstream

Show diffs side-by-side

added added

removed removed

Lines of Context: