/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/selftest/test_merge_core.py

merge from abently, take his fixes for merge in preference

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/test_merge_core.py
496
496
        mary_branch.commit("change file2")
497
497
        # john should be able to merge with no conflicts.
498
498
        merge_type = ApplyMerge3
499
 
        base = ("original", "auto")
 
499
        base = [None, None]
500
500
        other = ("mary", -1)
501
501
        merge(other, base, check_clean=True, merge_type=merge_type, this_dir="original")
502
502
        self.assertEqual("John\n", open("original/file1", "rt").read())