upstream/mercurial-mirror Files · tests/test-merge3

abort when merging two heads and repository has local changes

mpm@selenic.com - - Load All Authors

File last commit:

r814:0902ffec default


                r1581:db10b711

default

Download file

             test-merge3
        
                    10 lines
            
             | 146 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-merge3

History | Source | Raw |Copy content |Copy permalink

Thomas Arendsen Hein Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.	r800	#!/bin/sh
mpm@selenic.com [PATCH] (3/4) Removing an added file...	r402
		hg init
		echo This is file a1 > a
		hg add a
mpm@selenic.com Update tests to use commit -m and default -u...	r749	hg commit -m "commit #0" -d "0 0"
mpm@selenic.com [PATCH] (3/4) Removing an added file...	r402	touch b
		hg add b
		rm b
mpm@selenic.com Update tests to use commit -m and default -u...	r749	hg commit -A -m"comment #1" -d "0 0"

	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