view tests/test-merge8.out @ 5855:a6ccb957fd07

Solaris compatibility fixes for test-keyword: - do not use /bin/false (yields 255 instead of 1) - do not use "cd -", simply use "cd .." instead.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 14 Jan 2008 09:00:23 +0100
parents bb1800a7d7e1
children 0750f11152fe
line wrap: on
line source

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