← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_merge.py

  • Committer: John Arbash Meinel
  • Date: 2009-10-12 17:03:40 UTC
  • mfrom: (4679.3.94 2.1-simple-set)
  • mto: This revision was merged to the branch mainline in revision 4736.
  • Revision ID: john@arbash-meinel.com-20091012170340-o21aj90jbtswo9m4
Bring in the latest 'simple-set' code.

This is just a prep step for refining and landing the StaticTuple code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
605
605
 
606
606
    def test_merge_force(self):
607
607
        self.tree_a.commit('empty change to allow merge to run')
608
 
        # Second merge on top if the uncommitted one
 
608
        # Second merge on top of the uncommitted one
609
609
        self.run_bzr(['merge', '../a', '--force'], working_dir='b')
610
610
 
611
611