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

Incorporated most of Aron Griffis suggestions for sh compatibility.

Thomas Arendsen Hein - - Load All Authors

File last commit:

r800:ec85f9e6 default


                r804:19388dcb

default

Download file

             test-conflict
        
                    16 lines
            
             | 271 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-conflict

History | Source | Raw |Copy content |Copy permalink

Thomas Arendsen Hein Remove bashisms and use /bin/sh instead of /bin/bash....	r544	#!/bin/sh
mpm@selenic.com merge3: fix argument order...	r346
		hg init
		echo "nothing" > a
		hg add a
mpm@selenic.com Update tests to use commit -m and default -u...	r749	hg commit -m ancestor -d "0 0"
mpm@selenic.com merge3: fix argument order...	r346	echo "something" > a
mpm@selenic.com Update tests to use commit -m and default -u...	r749	hg commit -m branch1 -d "0 0"
mpm@selenic.com merge3: fix argument order...	r346	hg co 0
		echo "something else" > a
mpm@selenic.com Update tests to use commit -m and default -u...	r749	hg commit -m branch2 -d "0 0"
Thomas Arendsen Hein Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.	r800	HGMERGE=merge; export HGMERGE
mpm@selenic.com options: kill -d for debug...	r591	hg up -m 1
mpm@selenic.com merge3: fix argument order...	r346	hg id
mpm@selenic.com Tidy up conflict and pull tests...	r392	grep -Ev ">>>\|<<<" a
mpm@selenic.com merge3: fix argument order...	r346	hg status

	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