tests/test-586.out
author Dirkjan Ochtman <dirkjan@ochtman.nl>
Wed, 13 Feb 2008 16:46:43 +0100
changeset 6087 12856a1742dc
parent 4535 720ae5085ee3
child 5762 c2a21fe60994
permissions -rw-r--r--
better handle errors with date parsing (issue983) Windows cannot always handle a 1970-01-01 parameter to time.mktime().

adding a
adding b
pulling from ../a
searching for changes
warning: repository is unrelated
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
C b