test-flags.out
50 lines
| 1.2 KiB
| text/plain
|
TextLexer
/ tests / test-flags.out
|
r412 | pulling from ../test1 | ||
requesting all changes | ||||
adding changesets | ||||
adding manifests | ||||
|
r775 | adding file changes | ||
added 1 changesets with 2 changes to 2 files | ||||
|
r412 | (run 'hg update' to get a working copy) | ||
pulling from ../test2 | ||||
searching for changes | ||||
adding changesets | ||||
adding manifests | ||||
|
r775 | adding file changes | ||
|
r1043 | added 1 changesets with 1 changes to 1 files (+1 heads) | ||
|
r2019 | (run 'hg heads' to see heads, 'hg merge' to merge) | ||
|
r1933 | changeset: 2:b833d578451e | ||
|
r412 | tag: tip | ||
|
r1933 | parent: 0:4536b1c2ca69 | ||
|
r412 | user: test | ||
|
r1933 | date: Mon Jan 12 13:46:40 1970 +0000 | ||
|
r412 | summary: chmod +x a | ||
|
r1933 | changeset: 1:a187cb361a5a | ||
|
r412 | user: test | ||
|
r1933 | date: Mon Jan 12 13:46:40 1970 +0000 | ||
|
r412 | summary: a updated | ||
|
r1933 | changeset: 2:b833d578451e | ||
|
r412 | tag: tip | ||
|
r1933 | parent: 0:4536b1c2ca69 | ||
|
r412 | user: test | ||
|
r1933 | date: Mon Jan 12 13:46:40 1970 +0000 | ||
|
r412 | summary: chmod +x a | ||
|
r1933 | changeset: 1:a187cb361a5a | ||
|
r412 | user: test | ||
|
r1933 | date: Mon Jan 12 13:46:40 1970 +0000 | ||
|
r412 | summary: a updated | ||
|
r1933 | changeset: 0:4536b1c2ca69 | ||
|
r412 | user: test | ||
|
r1933 | date: Mon Jan 12 13:46:40 1970 +0000 | ||
|
r412 | summary: added a b | ||
resolving manifests | ||||
merging a | ||||
resolving a | ||||
|
r1922 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | ||
(branch merge, don't forget to commit) | ||||
|
r491 | -rwxr-x--- | ||
-rwxr-x--- | ||||