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

Added tests for bug with three-way-merging of old tip, tip and cwd.

mpm@selenic.com - - Load All Authors

File last commit:

r774:6592c4f5 default


                r792:49ec802b

default

Download file

             test-diffdir
        
                    12 lines
            
             | 179 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-diffdir

History | Source | Raw |Copy content |Copy permalink

mpm@selenic.com Refactor diffrevs/diffdir into changes...	r536	#!/bin/sh

		hg init
		touch a
		hg add a
mpm@selenic.com Update tests to use commit -m and default -u...	r749	hg ci -m "a" -d "0 0"
mpm@selenic.com Refactor diffrevs/diffdir into changes...	r536
		echo 123 > b
		hg add b
		hg diff \| sed "s/\(\(---\\|+++\).\)\t./\1/"

		hg diff -r tip \| sed "s/\(\(---\\|+++\).\)\t./\1/"

	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