tests/test-merge8.out
author Joel Rosdahl <joel@rosdahl.net>
Mon, 09 Apr 2007 10:39:28 +0200
changeset 4340 345ed833854d
parent 4311 4787e2b0dd03
child 4416 bb1800a7d7e1
permissions -rw-r--r--
Add graphlog extension

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
pulling from ../a
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
(run 'hg update' to get a working copy)
merging a and b
0 files updated, 1 files merged, 0 files removed, 0 files unresolved