~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

Merge integration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
12
12
 
13
13
class TestMerge(TestCaseInTempDir):
14
14
    """Test appending more than one revision"""
 
15
 
15
16
    def test_pending(self):
16
17
        br = Branch.initialize(u".")
17
18
        commit(br, "lala!")