tests/test-flags.out
author mpm@selenic.com
Sat, 20 Aug 2005 00:49:41 -0700
changeset 969 1d5b97537561
parent 967 1f3710636b45
child 981 4f81068ed8cd
permissions -rw-r--r--
Minor README updates

pulling from ../test1
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
(run 'hg update' to get a working copy)
pulling from ../test2
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
(run 'hg update' to get a working copy)
changeset:   2:3ef543305655
tag:         tip
parent:      0:22a449e20da5
user:        test
date:        Thu Jan  1 00:00:00 1970 +0000
summary:     chmod +x a

changeset:   1:c6ecefc45368
user:        test
date:        Thu Jan  1 00:00:00 1970 +0000
summary:     a updated

changeset:   2:3ef543305655
tag:         tip
parent:      0:22a449e20da5
user:        test
date:        Thu Jan  1 00:00:00 1970 +0000
summary:     chmod +x a

changeset:   1:c6ecefc45368
user:        test
date:        Thu Jan  1 00:00:00 1970 +0000
summary:     a updated

changeset:   0:22a449e20da5
user:        test
date:        Thu Jan  1 00:00:00 1970 +0000
summary:     added a b

resolving manifests
merging a
resolving a
-rwxr-x---
-rwxr-x---