tests/test-merge8.out
author Matt Mackall <mpm@selenic.com>
Thu, 11 Oct 2007 17:47:04 -0500
changeset 5458 cd1a6e7216c5
parent 4416 bb1800a7d7e1
permissions -rw-r--r--
mpatch: use int rather than ssize_t We might need to be more clever than this to make Py2.5 happy.

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)
1 files updated, 0 files merged, 1 files removed, 0 files unresolved