/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/tests/blackbox/test_merge.py

  • Committer: John Arbash Meinel
  • Date: 2009-10-15 20:04:37 UTC
  • mfrom: (4748 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4752.
  • Revision ID: john@arbash-meinel.com-20091015200437-4wweb0t6uzspvv84
Bring in bzr.dev 4748, resolve conflict, update NEWS.

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