##// END OF EJS Templates
filemerge: remove leading space from " no tool found..."...
Martin von Zweigbergk -
r26967:7a8e9a98 default
parent child Browse files
Show More
@@ -177,7 +177,7 b' def _iprompt(repo, mynode, orig, fcd, fc'
177 fd = fcd.path()
177 fd = fcd.path()
178
178
179 try:
179 try:
180 index = ui.promptchoice(_(" no tool found to merge %s\n"
180 index = ui.promptchoice(_("no tool found to merge %s\n"
181 "keep (l)ocal or take (o)ther?"
181 "keep (l)ocal or take (o)ther?"
182 "$$ &Local $$ &Other") % fd, 0)
182 "$$ &Local $$ &Other") % fd, 0)
183 choice = ['local', 'other'][index]
183 choice = ['local', 'other'][index]
@@ -531,7 +531,7 b' ui.merge specifies internal:prompt:'
531 true.executable=cat
531 true.executable=cat
532 # hg update -C 1
532 # hg update -C 1
533 $ hg merge -r 2 --config ui.merge=internal:prompt
533 $ hg merge -r 2 --config ui.merge=internal:prompt
534 no tool found to merge f
534 no tool found to merge f
535 keep (l)ocal or take (o)ther? l
535 keep (l)ocal or take (o)ther? l
536 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
536 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
537 (branch merge, don't forget to commit)
537 (branch merge, don't forget to commit)
@@ -553,7 +553,7 b' prompt with EOF'
553 true.executable=cat
553 true.executable=cat
554 # hg update -C 1
554 # hg update -C 1
555 $ hg merge -r 2 --config ui.merge=internal:prompt --config ui.interactive=true
555 $ hg merge -r 2 --config ui.merge=internal:prompt --config ui.interactive=true
556 no tool found to merge f
556 no tool found to merge f
557 keep (l)ocal or take (o)ther?
557 keep (l)ocal or take (o)ther?
558 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
558 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
559 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
559 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
@@ -567,7 +567,7 b' prompt with EOF'
567 # hg resolve --list
567 # hg resolve --list
568 U f
568 U f
569 $ hg resolve --all --config ui.merge=internal:prompt --config ui.interactive=true
569 $ hg resolve --all --config ui.merge=internal:prompt --config ui.interactive=true
570 no tool found to merge f
570 no tool found to merge f
571 keep (l)ocal or take (o)ther?
571 keep (l)ocal or take (o)ther?
572 [1]
572 [1]
573 $ aftermerge
573 $ aftermerge
@@ -581,7 +581,7 b' prompt with EOF'
581 U f
581 U f
582 $ rm f
582 $ rm f
583 $ hg resolve --all --config ui.merge=internal:prompt --config ui.interactive=true
583 $ hg resolve --all --config ui.merge=internal:prompt --config ui.interactive=true
584 no tool found to merge f
584 no tool found to merge f
585 keep (l)ocal or take (o)ther?
585 keep (l)ocal or take (o)ther?
586 [1]
586 [1]
587 $ aftermerge
587 $ aftermerge
@@ -593,7 +593,7 b' prompt with EOF'
593 # hg resolve --list
593 # hg resolve --list
594 U f
594 U f
595 $ hg resolve --all --config ui.merge=internal:prompt
595 $ hg resolve --all --config ui.merge=internal:prompt
596 no tool found to merge f
596 no tool found to merge f
597 keep (l)ocal or take (o)ther? l
597 keep (l)ocal or take (o)ther? l
598 (no more unresolved files)
598 (no more unresolved files)
599 $ aftermerge
599 $ aftermerge
@@ -171,7 +171,7 b' Update to link with local change should '
171 a: versions differ -> m (premerge)
171 a: versions differ -> m (premerge)
172 (couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re)
172 (couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re)
173 picked tool ':prompt' for a (binary False symlink True)
173 picked tool ':prompt' for a (binary False symlink True)
174 no tool found to merge a
174 no tool found to merge a
175 keep (l)ocal or take (o)ther? l
175 keep (l)ocal or take (o)ther? l
176 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
176 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
177 $ hg diff --git
177 $ hg diff --git
General Comments 0
You need to be logged in to leave comments. Login now