Mercurial > hg
comparison tests/test-conflict.t @ 38965:cf68e2649e0a
status: advertise --abort instead of 'update -C .' to abort a merge
status has a part where it shows the conflict information and how to continue or
abort. Couple of release ago, we got merge --abort and we should advertise that
instead of 'hg update -C .' which is kind of ugly.
I know we need to unify the logic here.
Differential Revision: https://phab.mercurial-scm.org/D4168
author | Pulkit Goyal <pulkit@yandex-team.ru> |
---|---|
date | Thu, 09 Aug 2018 12:32:11 +0300 |
parents | 50f5fc232c16 |
children | 5abc47d4ca6b |
comparison
equal
deleted
inserted
replaced
38964:05ded838c997 | 38965:cf68e2649e0a |
---|---|
56 # a | 56 # a |
57 # | 57 # |
58 # To mark files as resolved: hg resolve --mark FILE | 58 # To mark files as resolved: hg resolve --mark FILE |
59 | 59 |
60 # To continue: hg commit | 60 # To continue: hg commit |
61 # To abort: hg update --clean . (warning: this will discard uncommitted changes) | 61 # To abort: hg merge --abort |
62 | 62 |
63 | 63 |
64 $ cat a | 64 $ cat a |
65 Small Mathematical Series. | 65 Small Mathematical Series. |
66 1 | 66 1 |