upstream/mercurial-mirror Files · tests/test-merge5.out

Merge with upstream

mpm@selenic.com - - Load All Authors

File last commit:

r925:5a034646 default


                r1538:482b4efd

default

Download file

             test-merge5.out
        
                    5 lines
            
             | 170 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-merge5.out

History | Source | Raw |Copy content |Copy permalink

Bryan O'Sullivan Update tests to match new addremove chattiness.	r767	removing b
mpm@selenic.com [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted...	r415	this update spans a branch affecting the following files:
maf46@burn.cl.cam.ac.uk Fix zombie files in merge...	r616	b
mpm@selenic.com [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted...	r415	aborting update spanning branches!
Bryan O'Sullivan Update output for test-merge5.	r819	(use update -m to merge across branches or -C to lose changes)

	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