equal
deleted
inserted
replaced
73 1 new orphan changesets |
73 1 new orphan changesets |
74 |
74 |
75 $ hg glog |
75 $ hg glog |
76 @ 3 - 87495ea7c9ec b (draft) |
76 @ 3 - 87495ea7c9ec b (draft) |
77 | |
77 | |
78 | * 2 - 13833940840c c (secret) |
78 | o 2 - 13833940840c c (secret) |
79 | | |
79 | | |
80 | x 1 - 1e6c11564562 b (draft) |
80 | x 1 - 1e6c11564562 b (draft) |
81 |/ |
81 |/ |
82 o 0 - cb9a9f314b8b a (draft) |
82 o 0 - cb9a9f314b8b a (draft) |
83 |
83 |
103 +>>>>>>> evolving: 13833940840c - test: c |
103 +>>>>>>> evolving: 13833940840c - test: c |
104 |
104 |
105 $ hg glog |
105 $ hg glog |
106 @ 3 - 87495ea7c9ec b (draft) |
106 @ 3 - 87495ea7c9ec b (draft) |
107 | |
107 | |
108 | * 2 - 13833940840c c (secret) |
108 | o 2 - 13833940840c c (secret) |
109 | | |
109 | | |
110 | x 1 - 1e6c11564562 b (draft) |
110 | x 1 - 1e6c11564562 b (draft) |
111 |/ |
111 |/ |
112 o 0 - cb9a9f314b8b a (draft) |
112 o 0 - cb9a9f314b8b a (draft) |
113 |
113 |