equal
deleted
inserted
replaced
14 (run 'hg update' to get a working copy) |
14 (run 'hg update' to get a working copy) |
15 changeset: 2:3ef543305655 |
15 changeset: 2:3ef543305655 |
16 tag: tip |
16 tag: tip |
17 parent: 0:22a449e20da5 |
17 parent: 0:22a449e20da5 |
18 user: test |
18 user: test |
19 date: Thu Jan 1 00:00:00 1970 |
19 date: Thu Jan 1 00:00:00 1970 +0000 |
20 summary: chmod +x a |
20 summary: chmod +x a |
21 |
21 |
22 changeset: 1:c6ecefc45368 |
22 changeset: 1:c6ecefc45368 |
23 user: test |
23 user: test |
24 date: Thu Jan 1 00:00:00 1970 |
24 date: Thu Jan 1 00:00:00 1970 +0000 |
25 summary: a updated |
25 summary: a updated |
26 |
26 |
27 changeset: 2:3ef543305655 |
27 changeset: 2:3ef543305655 |
28 tag: tip |
28 tag: tip |
29 parent: 0:22a449e20da5 |
29 parent: 0:22a449e20da5 |
30 user: test |
30 user: test |
31 date: Thu Jan 1 00:00:00 1970 |
31 date: Thu Jan 1 00:00:00 1970 +0000 |
32 summary: chmod +x a |
32 summary: chmod +x a |
33 |
33 |
34 changeset: 1:c6ecefc45368 |
34 changeset: 1:c6ecefc45368 |
35 user: test |
35 user: test |
36 date: Thu Jan 1 00:00:00 1970 |
36 date: Thu Jan 1 00:00:00 1970 +0000 |
37 summary: a updated |
37 summary: a updated |
38 |
38 |
39 changeset: 0:22a449e20da5 |
39 changeset: 0:22a449e20da5 |
40 user: test |
40 user: test |
41 date: Thu Jan 1 00:00:00 1970 |
41 date: Thu Jan 1 00:00:00 1970 +0000 |
42 summary: added a b |
42 summary: added a b |
43 |
43 |
44 resolving manifests |
44 resolving manifests |
45 merging a |
45 merging a |
46 resolving a |
46 resolving a |