tests/test-merge6.out
changeset 993 6f274afc05c7
parent 990 5007e0bdeed2
child 1043 9344f5dd4488
equal deleted inserted replaced
992:f859e9cba1b9 993:6f274afc05c7
     4 adding manifests
     4 adding manifests
     5 adding file changes
     5 adding file changes
     6 added 1 changesets with 1 changes to 1 files
     6 added 1 changesets with 1 changes to 1 files
     7 (run 'hg update' to get a working copy)
     7 (run 'hg update' to get a working copy)
     8 bar should remain deleted.
     8 bar should remain deleted.
     9 f405ac83a5611071d6b54dd5eb26943b1fdc4460 644 foo
     9 f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo
    10 pulling from ../A2
    10 pulling from ../A2
    11 searching for changes
    11 searching for changes
    12 adding changesets
    12 adding changesets
    13 adding manifests
    13 adding manifests
    14 adding file changes
    14 adding file changes