tests/test-merge8.out
author Dirkjan Ochtman <dirkjan@ochtman.nl>
Wed, 13 Feb 2008 16:46:43 +0100
changeset 6086 e85deb6dcf9d
parent 4416 bb1800a7d7e1
child 6338 0750f11152fe
permissions -rw-r--r--
better handle errors with date parsing (issue983) Windows cannot always handle a 1970-01-01 parameter to time.mktime().

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