equal
deleted
inserted
replaced
1 reverting foo |
1 reverting foo |
2 changeset 2:4d9e78aaceee backs out changeset 1:b515023e500e |
2 changeset 2:4d9e78aaceee backs out changeset 1:b515023e500e |
3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
4 searching for copies back to rev 1 |
|
5 unmatched files in local: |
|
6 bar |
4 resolving manifests |
7 resolving manifests |
5 overwrite None partial False |
8 overwrite None partial False |
6 ancestor bbd179dfa0a7 local 71766447bdbb+ remote 4d9e78aaceee |
9 ancestor bbd179dfa0a7 local 71766447bdbb+ remote 4d9e78aaceee |
7 searching for copies back to rev 1 |
|
8 unmatched files in local: |
|
9 bar |
|
10 foo: remote is newer -> g |
10 foo: remote is newer -> g |
11 getting foo |
11 getting foo |
12 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
12 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
13 (branch merge, don't forget to commit) |
13 (branch merge, don't forget to commit) |
14 n 0 -2 unset foo |
14 n 0 -2 unset foo |