equal
deleted
inserted
replaced
54 1 new orphan changesets |
54 1 new orphan changesets |
55 |
55 |
56 $ hg glog |
56 $ hg glog |
57 @ 4:64370c9805e7 added b |
57 @ 4:64370c9805e7 added b |
58 | () draft |
58 | () draft |
59 | * 3:3b2b6f4652ee merging a and b |
59 | o 3:3b2b6f4652ee merging a and b |
60 | |\ () draft |
60 | |\ () draft |
61 +---x 2:d76850646258 added b |
61 +---x 2:d76850646258 added b |
62 | | () draft |
62 | | () draft |
63 | o 1:c7586e2a9264 added a |
63 | o 1:c7586e2a9264 added a |
64 |/ () draft |
64 |/ () draft |
99 1 new orphan changesets |
99 1 new orphan changesets |
100 |
100 |
101 $ hg glog |
101 $ hg glog |
102 @ 6:3d41537b44ca added a |
102 @ 6:3d41537b44ca added a |
103 | () draft |
103 | () draft |
104 | * 5:91fd62122a4b merging a and b |
104 | o 5:91fd62122a4b merging a and b |
105 | |\ () draft |
105 | |\ () draft |
106 +---o 4:64370c9805e7 added b |
106 +---o 4:64370c9805e7 added b |
107 | | () draft |
107 | | () draft |
108 | x 1:c7586e2a9264 added a |
108 | x 1:c7586e2a9264 added a |
109 |/ () draft |
109 |/ () draft |
175 |
175 |
176 $ hg merge |
176 $ hg merge |
177 merging c |
177 merging c |
178 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
178 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
179 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
179 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
180 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
180 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
181 [1] |
181 [1] |
182 $ echo foobar > c |
182 $ echo foobar > c |
183 $ hg resolve -m |
183 $ hg resolve -m |
184 (no more unresolved files) |
184 (no more unresolved files) |
185 $ hg ci -m "foobar to c" |
185 $ hg ci -m "foobar to c" |
203 1 new orphan changesets |
203 1 new orphan changesets |
204 |
204 |
205 $ hg glog |
205 $ hg glog |
206 @ 11:31c317b7bdb1 foo to c |
206 @ 11:31c317b7bdb1 foo to c |
207 | () draft |
207 | () draft |
208 | * 10:fd41d25a3e90 foobar to c |
208 | o 10:fd41d25a3e90 foobar to c |
209 | |\ () draft |
209 | |\ () draft |
210 +---o 9:d0f84b25d4e3 bar to c |
210 +---o 9:d0f84b25d4e3 bar to c |
211 | | () draft |
211 | | () draft |
212 | x 8:1c165c673853 foo to c |
212 | x 8:1c165c673853 foo to c |
213 |/ () draft |
213 |/ () draft |
258 1 new orphan changesets |
258 1 new orphan changesets |
259 |
259 |
260 $ hg glog |
260 $ hg glog |
261 @ 13:928097d0b5b5 foo to c |
261 @ 13:928097d0b5b5 foo to c |
262 | () draft |
262 | () draft |
263 | * 12:c5405d2da7a1 foobar to c |
263 | o 12:c5405d2da7a1 foobar to c |
264 | |\ () draft |
264 | |\ () draft |
265 +---x 11:31c317b7bdb1 foo to c |
265 +---x 11:31c317b7bdb1 foo to c |
266 | | () draft |
266 | | () draft |
267 | o 9:d0f84b25d4e3 bar to c |
267 | o 9:d0f84b25d4e3 bar to c |
268 |/ () draft |
268 |/ () draft |
332 2 new orphan changesets |
332 2 new orphan changesets |
333 |
333 |
334 $ hg glog |
334 $ hg glog |
335 @ 20:fccc9de66799 added l |
335 @ 20:fccc9de66799 added l |
336 | () draft |
336 | () draft |
337 | * 19:190763373d8b merge commit |
337 | o 19:190763373d8b merge commit |
338 | |\ () draft |
338 | |\ () draft |
339 | | o 18:863d11043c67 added y |
339 | | o 18:863d11043c67 added y |
340 | | | () draft |
340 | | | () draft |
341 +---o 17:3f2247835c1d added x |
341 +---o 17:3f2247835c1d added x |
342 | | () draft |
342 | | () draft |
343 | * 16:e44dc179e7f5 added m |
343 | o 16:e44dc179e7f5 added m |
344 | | () draft |
344 | | () draft |
345 | x 15:8634bee7bf1e added l |
345 | x 15:8634bee7bf1e added l |
346 |/ () draft |
346 |/ () draft |
347 o 0:8fa14d15e168 added hgignore |
347 o 0:8fa14d15e168 added hgignore |
348 () draft |
348 () draft |
400 $ hg glog |
400 $ hg glog |
401 @ 25:cdf6547da25f added x |
401 @ 25:cdf6547da25f added x |
402 | () draft |
402 | () draft |
403 | o 24:3f371171d767 added l |
403 | o 24:3f371171d767 added l |
404 |/ () draft |
404 |/ () draft |
405 | * 23:7b78a9784f3e merged l and x |
405 | o 23:7b78a9784f3e merged l and x |
406 | |\ () draft |
406 | |\ () draft |
407 +---x 20:fccc9de66799 added l |
407 +---x 20:fccc9de66799 added l |
408 | | () draft |
408 | | () draft |
409 | x 17:3f2247835c1d added x |
409 | x 17:3f2247835c1d added x |
410 |/ () draft |
410 |/ () draft |