← Back to branch summary

~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 4797.21.1.

  • Committer: Aaron Bentley
  • Date: 2010-02-17 23:40:51 UTC
  • mto: (4797.2.19 2.1)
  • mto: This revision was merged to the branch mainline in revision 5055.
  • Revision ID: aaron@aaronbentley.com-20100217234051-z6u2i3yd0gizc12r
Fix merge when this_tree is not a WorkingTree.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: