tests/test-merge8.out
author Christian Ebert <blacktrash@gmx.net>
Wed, 09 Apr 2008 14:12:32 +0200
changeset 6506 850071c017fa
parent 6338 0750f11152fe
child 9611 a3d73b3e1f8a
permissions -rw-r--r--
keyword: check for '\0' in entire data before acting util.binary might not be safe enough, as it fails eg. on certain pdf files (issue1066).

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