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

Moving hgweb.py into it's own module in preparation for breaking it up.

Vadim Gelfer - - Load All Authors

File last commit:

r2283:e506c143 default


                r2311:b832b6eb

default

Download file

             test-conflict
        
                    16 lines
            
             | 289 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
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	hg commit -m ancestor -d "1000000 0"
mpm@selenic.com merge3: fix argument order...	r346	echo "something" > a
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	hg commit -m branch1 -d "1000000 0"
mpm@selenic.com merge3: fix argument order...	r346	hg co 0
		echo "something else" > a
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	hg commit -m branch2 -d "1000000 0"
Thomas Arendsen Hein Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.	r800	HGMERGE=merge; export HGMERGE
Vadim Gelfer deprecate 'update -m'. use 'merge' instead.	r2283	hg merge 1
mpm@selenic.com merge3: fix argument order...	r346	hg id
Peter van Dijk small solaris portability fixes from John Levon <levon@movementarian.org>	r1925	egrep -v ">>>\|<<<" 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