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

Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli....

Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli. Changes from the original patch: - - Use 'diff -r ...' instead of 'hg diff -r ...' to support filetype detection by at least file(1) and vim. - - Adjusted tests for this change. - - Some cleanups. manifest hash: -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCsyZzW7P1GVgWeRoRAqczAJ479lR9Z289sP+VH5L+N7pQRU14SACfUueq 88ABloIR3VyRIa4qbujnZio= =Vva9 -----END PGP SIGNATURE-----

mpm@selenic.com - - Load All Authors

File last commit:

r392:ee4c80d2 default


                r396:8f8bb77d

default

Download file

             test-conflict
        
                    17 lines
            
             | 298 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-conflict

History | Annotation | Raw |Copy content |Copy permalink

				#!/bin/bash

				set -x
				hg init
				echo "nothing" > a
				hg add a
				hg commit -t ancestor -u test -d "0 0"
				echo "something" > a
				hg commit -t branch1 -u test -d "0 0"
				hg co 0
				echo "something else" > a
				hg commit -t branch2 -u test -d "0 0"
				export HGMERGE=merge
				hg -d up -m 1
				hg id
				grep -Ev ">>>\|<<<" a
				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