equal
deleted
inserted
replaced
295 $ hg up 15 |
295 $ hg up 15 |
296 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
296 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
297 Working directory parent is obsolete |
297 Working directory parent is obsolete |
298 $ echo 'gotta break' >> a |
298 $ echo 'gotta break' >> a |
299 $ hg amend |
299 $ hg amend |
300 1 new divergent changesets |
300 2 new divergent changesets |
|
301 $ hg phase 'divergent()' |
|
302 22: draft |
|
303 24: draft |
301 $ hg evolve -qn |
304 $ hg evolve -qn |
302 hg update -c c956a4b140b6 && |
305 hg update -c c956a4b140b6 && |
303 hg merge ac6d600735a4 && |
306 hg merge ac6d600735a4 && |
304 hg commit -m "auto merge resolving conflict between c956a4b140b6 and ac6d600735a4"&& |
307 hg commit -m "auto merge resolving conflict between c956a4b140b6 and ac6d600735a4"&& |
305 hg up -C 7391601a4bfa && |
308 hg up -C 7391601a4bfa && |