tests/test-flags.out
author Matt Mackall <mpm@selenic.com>
Tue, 08 Aug 2006 10:35:19 -0500
changeset 2814 0f787997e3c2
parent 2175 b2ae81a7df29
child 3311 966632304dde
child 3321 455109df3669
permissions -rw-r--r--
Merge: move most tests to the beginning

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)
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
pulling from ../test2
searching for changes
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)
changeset:   2:b833d578451e
tag:         tip
parent:      0:4536b1c2ca69
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     chmod +x a

changeset:   1:a187cb361a5a
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     a updated

changeset:   2:b833d578451e
tag:         tip
parent:      0:4536b1c2ca69
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     chmod +x a

changeset:   1:a187cb361a5a
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     a updated

changeset:   0:4536b1c2ca69
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     added a b

resolving manifests
merging a
resolving a
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
-rwxr-x---
-rwxr-x---