upstream/mercurial-mirror Files · tests/test-mq-qdelete.out

run-tests.py: pass -L/--label to simplemerge...

run-tests.py: pass -L/--label to simplemerge This should give us conflict markers that don't change from one run to another. Remove some sed's/egrep's from some tests.

Brendan Cully - - Load All Authors

File last commit:

r3376:b9a7c07f default


                r4387:93a4e72b

default

Download file

             test-mq-qdelete.out
        
                    23 lines
            
             | 254 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-mq-qdelete.out

History | Annotation | Raw |Copy content |Copy permalink

				adding base
				abort: cannot delete applied patch c
				Now at: b
				a
				b
				a
				b
				series
				status
				Now at: a
				a
				b
				series
				status
				1 New patch: a
				0 base
				abort: cannot delete revision 3 above applied patches
				f
				4 New patch: f
				3 New patch: e
				2 New patch: d
				1 New patch: a
				0 base

	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