4 parents, but if we look at the file-level history, we'll notice that

     4 parents, but if we look at the file-level history, we'll notice that

     5 the version in p1 is an ancestor of the version in p2. This test makes

     5 the version in p1 is an ancestor of the version in p2. This test makes

     6 sure that we'll use the version from p2 in the manifest of the merge

     6 sure that we'll use the version from p2 in the manifest of the merge

     7 revision.

     7 revision.

     8 

     8 

    10 

    11 

    11   $ echo foo > foo

    12   $ echo foo > foo

    12   $ hg ci -qAm 'add foo'

    13   $ hg ci -qAm 'add foo'

    13 

    14 

    14   $ echo bar >> foo

    15   $ echo bar >> foo