Mercurial > evolve
comparison tests/test-stabilize-result.t @ 3740:07e246deb612
evolve: show cset hash in "update to local conflict" message
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Sun, 29 Apr 2018 19:14:41 +0530 |
| parents | 0bfc4fe3baf8 |
| children | ec460882eab7 |
comparison
equal
deleted
inserted
replaced
| 3739:0bfc4fe3baf8 | 3740:07e246deb612 |
|---|---|
| 413 continue: hg evolve --continue | 413 continue: hg evolve --continue |
| 414 $ hg evolve --continue | 414 $ hg evolve --continue |
| 415 merge:[17] More addition (2) | 415 merge:[17] More addition (2) |
| 416 with: [18] More addition (2) | 416 with: [18] More addition (2) |
| 417 base: [16] More addition | 417 base: [16] More addition |
| 418 updating to "local" conflict | 418 updating to "local" side of the conflict: 0b336205a5d0 |
| 419 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 419 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 420 working directory is now at e015aa78acee | 420 working directory is now at e015aa78acee |
| 421 $ glog | 421 $ glog |
| 422 @ 18:e015aa78acee@default(draft) bk:[] More addition (2) | 422 @ 18:e015aa78acee@default(draft) bk:[] More addition (2) |
| 423 | | 423 | |