Mercurial > hg-stable
changeset 26967:7a8e9a985c3b
filemerge: remove leading space from " no tool found..."
I could not find or see a reason for the unusual formatting. The lines
following it in the test cases are not indented.
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Wed, 11 Nov 2015 10:19:11 -0800 |
| parents | 51fa43a3cd58 |
| children | 216cc65cf227 |
| files | mercurial/filemerge.py tests/test-merge-tools.t tests/test-merge-types.t |
| diffstat | 3 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/filemerge.py Mon Nov 09 22:31:01 2015 +0900 +++ b/mercurial/filemerge.py Wed Nov 11 10:19:11 2015 -0800 @@ -177,7 +177,7 @@ fd = fcd.path() try: - index = ui.promptchoice(_(" no tool found to merge %s\n" + index = ui.promptchoice(_("no tool found to merge %s\n" "keep (l)ocal or take (o)ther?" "$$ &Local $$ &Other") % fd, 0) choice = ['local', 'other'][index]
--- a/tests/test-merge-tools.t Mon Nov 09 22:31:01 2015 +0900 +++ b/tests/test-merge-tools.t Wed Nov 11 10:19:11 2015 -0800 @@ -531,7 +531,7 @@ true.executable=cat # hg update -C 1 $ hg merge -r 2 --config ui.merge=internal:prompt - no tool found to merge f + no tool found to merge f keep (l)ocal or take (o)ther? l 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) @@ -553,7 +553,7 @@ true.executable=cat # hg update -C 1 $ hg merge -r 2 --config ui.merge=internal:prompt --config ui.interactive=true - no tool found to merge f + no tool found to merge f keep (l)ocal or take (o)ther? 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon @@ -567,7 +567,7 @@ # hg resolve --list U f $ hg resolve --all --config ui.merge=internal:prompt --config ui.interactive=true - no tool found to merge f + no tool found to merge f keep (l)ocal or take (o)ther? [1] $ aftermerge @@ -581,7 +581,7 @@ U f $ rm f $ hg resolve --all --config ui.merge=internal:prompt --config ui.interactive=true - no tool found to merge f + no tool found to merge f keep (l)ocal or take (o)ther? [1] $ aftermerge @@ -593,7 +593,7 @@ # hg resolve --list U f $ hg resolve --all --config ui.merge=internal:prompt - no tool found to merge f + no tool found to merge f keep (l)ocal or take (o)ther? l (no more unresolved files) $ aftermerge
--- a/tests/test-merge-types.t Mon Nov 09 22:31:01 2015 +0900 +++ b/tests/test-merge-types.t Wed Nov 11 10:19:11 2015 -0800 @@ -171,7 +171,7 @@ a: versions differ -> m (premerge) (couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re) picked tool ':prompt' for a (binary False symlink True) - no tool found to merge a + no tool found to merge a keep (l)ocal or take (o)ther? l 0 files updated, 1 files merged, 0 files removed, 0 files unresolved $ hg diff --git