tests/test-merge8.out
author Dirkjan Ochtman <dirkjan@ochtman.nl>
Mon, 14 Apr 2008 14:34:38 +0200
changeset 6548 962eb403165b
parent 6338 0750f11152fe
child 9611 a3d73b3e1f8a
permissions -rw-r--r--
replace usage of os.popen() with util.popen() To make this possible, I added a mode parameter to both implementations of util.popen(), defaulting to 'r' (as it does in the Python stdlib).

updating working directory
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