Mercurial > hg
changeset 29975:c15f06109b7a
localrepo: use single quotes in use warning
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Tue, 20 Sep 2016 23:48:08 +0000 |
| parents | 7109d5ddeb0c |
| children | 42d031560294 |
| files | mercurial/localrepo.py tests/test-commit-unresolved.t tests/test-graft.t tests/test-rebase-conflicts.t tests/test-rename-merge2.t |
| diffstat | 5 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/localrepo.py Tue Sep 20 23:47:46 2016 +0000 +++ b/mercurial/localrepo.py Tue Sep 20 23:48:08 2016 +0000 @@ -1625,8 +1625,8 @@ ms = mergemod.mergestate.read(self) if list(ms.unresolved()): - raise error.Abort(_('unresolved merge conflicts ' - '(see "hg help resolve")')) + raise error.Abort(_("unresolved merge conflicts " + "(see 'hg help resolve')")) if ms.mdstate() != 's' or list(ms.driverresolved()): raise error.Abort(_('driver-resolved merge conflicts'), hint=_('run "hg resolve --all" to resolve'))
--- a/tests/test-commit-unresolved.t Tue Sep 20 23:47:46 2016 +0000 +++ b/tests/test-commit-unresolved.t Tue Sep 20 23:48:08 2016 +0000 @@ -34,7 +34,7 @@ $ echo "ABCD" > A $ hg commit -m "Merged" - abort: unresolved merge conflicts (see "hg help resolve") + abort: unresolved merge conflicts (see 'hg help resolve') [255] Mark the conflict as resolved and commit @@ -56,7 +56,7 @@ [1] $ hg rm --force A $ hg commit -m merged - abort: unresolved merge conflicts (see "hg help resolve") + abort: unresolved merge conflicts (see 'hg help resolve') [255] $ hg resolve -ma
--- a/tests/test-graft.t Tue Sep 20 23:47:46 2016 +0000 +++ b/tests/test-graft.t Tue Sep 20 23:48:08 2016 +0000 @@ -253,7 +253,7 @@ $ hg graft -c grafting 4:9c233e8e184d "4" - abort: unresolved merge conflicts (see "hg help resolve") + abort: unresolved merge conflicts (see 'hg help resolve') [255] Fix up:
--- a/tests/test-rebase-conflicts.t Tue Sep 20 23:47:46 2016 +0000 +++ b/tests/test-rebase-conflicts.t Tue Sep 20 23:48:08 2016 +0000 @@ -75,7 +75,7 @@ $ hg rebase --continue already rebased 3:3163e20567cc "L1" as 3e046f2ecedb rebasing 4:46f0b057b5c0 "L2" - abort: unresolved merge conflicts (see "hg help resolve") + abort: unresolved merge conflicts (see 'hg help resolve') [255] Conclude rebase:
--- a/tests/test-rename-merge2.t Tue Sep 20 23:47:46 2016 +0000 +++ b/tests/test-rename-merge2.t Tue Sep 20 23:48:08 2016 +0000 @@ -719,7 +719,7 @@ -------------- M a M b - abort: unresolved merge conflicts (see "hg help resolve") + abort: unresolved merge conflicts (see 'hg help resolve') -------------- $ tm "up a b" "nm a b" " " "19 merge b no ancestor, prompt remove a" @@ -764,7 +764,7 @@ -------------- M b C a - abort: unresolved merge conflicts (see "hg help resolve") + abort: unresolved merge conflicts (see 'hg help resolve') -------------- $ tm "up a " "um a b" " " "20 merge a and b to b, remove a"