← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commands.py

  • Committer: aaron.bentley at utoronto
  • Date: 2005-08-25 02:10:04 UTC
  • mto: (1092.1.41) (1185.3.4)
  • mto: This revision was merged to the branch mainline in revision 1139.
  • Revision ID: aaron.bentley@utoronto.ca-20050825021004-a7afd22f3dd52b2e
pending merges, common ancestor work properly

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commands.py
1488
1488
            merge_type = ApplyMerge3
1489
1489
 
1490
1490
        if revision is None or len(revision) < 1:
1491
 
            base = (None, None)
 
1491
            base = [None, None]
1492
1492
            other = (branch, -1)
1493
1493
        else:
1494
1494
            if len(revision) == 1: