~bzr-pqm/bzr/bzr.dev

Viewing changes to bzrlib/builtins.py

Committer: Aaron Bentley
Date: 2006-03-10 00:18:58 UTC
mfrom: (1551.5.1 Aaron's mergeable stuff)
mto: (1534.10.5 Transactional Tree Transforms) (1551.6.4 Aaron's mergeable stuff) (1634.1.1 integration) (1558.8.2 bzr.progress)
mto: This revision was merged to the branch mainline in revision 1607.
Revision ID: aaron.bentley@utoronto.ca-20060310001858-72b1a0a70172263c

Trivial remerge fix

added added

removed removed

1917

restore(tree.abspath(filename))

1918

except NotConflicted:

1919

pass

1920

conflicts = merge_inner(tree.branch, other_tree, base_tree,

1920

conflicts = merge_inner(tree.branch, other_tree, base_tree,

1921

this_tree=tree,

1921

1922

interesting_ids = interesting_ids,

1922

1923

other_rev_id=pending_merges[0],

1923

1924

merge_type=merge_type,