upstream/mercurial-mirror Files · tests/test-simplemerge.py.out

filemerge: show warning about choice of :prompt only at an actual fallback...

filemerge: show warning about choice of :prompt only at an actual fallback Before this patch, internal merge tool :prompt shows "no tool found to merge FILE" line, even if :prompt is explicitly specified as a tool to be used. This patch shows warning message about choice of :prompt only at an actual fallback, in which case any tool is rejected by capability for binary or symlink. It is for backward compatibility to omit warning message in "changedelete" case.

Pierre-Yves David - - Load All Authors

File last commit:

r22023:f1883065 default


                r32253:7d4ce4b5

default

Download file

             test-simplemerge.py.out
        
                    5 lines
            
             | 115 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-simplemerge.py.out

History | Source | Raw |Copy content |Copy permalink

Pierre-Yves David simplemerge: burn "minimal" feature to the ground...	r22023	................
Alexis S. L. Carvalho actually port simplemerge to hg...	r4363	----------------------------------------------------------------------
Pierre-Yves David simplemerge: burn "minimal" feature to the ground...	r22023	Ran 16 tests in 0.000s
Alexis S. L. Carvalho actually port simplemerge to hg...	r4363
		OK

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages