Mercurial > hg > mercurial-source
view tests/test-flags.out @ 981:4f81068ed8cd
Merge with jeffpc
author | mpm@selenic.com |
---|---|
date | Sat, 20 Aug 2005 13:08:07 -0700 |
parents | 1f3710636b45 5a034646e472 |
children | 9344f5dd4488 |
line wrap: on
line source
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---