equal
deleted
inserted
replaced
50 parent: 0:22a449e20da501ca558394c083ca470e9c81b9f7 |
50 parent: 0:22a449e20da501ca558394c083ca470e9c81b9f7 |
51 user: test |
51 user: test |
52 date: Thu Jan 1 00:00:00 1970 |
52 date: Thu Jan 1 00:00:00 1970 |
53 summary: chmod +x a |
53 summary: chmod +x a |
54 |
54 |
55 |
|
56 changeset: 1:c6ecefc45368ed556d965f1c1086c6561a8b2ac5 |
55 changeset: 1:c6ecefc45368ed556d965f1c1086c6561a8b2ac5 |
57 user: test |
56 user: test |
58 date: Thu Jan 1 00:00:00 1970 |
57 date: Thu Jan 1 00:00:00 1970 |
59 summary: a updated |
58 summary: a updated |
60 |
59 |
61 |
|
62 changeset: 0:22a449e20da501ca558394c083ca470e9c81b9f7 |
60 changeset: 0:22a449e20da501ca558394c083ca470e9c81b9f7 |
63 user: test |
61 user: test |
64 date: Thu Jan 1 00:00:00 1970 |
62 date: Thu Jan 1 00:00:00 1970 |
65 summary: added a b |
63 summary: added a b |
66 |
|
67 |
64 |
68 + hg -v co -m |
65 + hg -v co -m |
69 resolving manifests |
66 resolving manifests |
70 merging a |
67 merging a |
71 resolving a |
68 resolving a |