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

add prechangegroup and pretxnchangegroup hooks....

add prechangegroup and pretxnchangegroup hooks. prechangegroup lets you stop push, pull or unbundle before it begins. pretxnchangegroup lets you inspect changegroup before transaction is committed, and roll back if you not like it.

mpm@selenic.com - - Load All Authors

File last commit:

r925:5a034646 default


                r1730:0f1d2c75

default

Download file

             test-conflict.out
        
                    8 lines
            
             | 135 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-conflict.out

History | Source | Raw |Copy content |Copy permalink

mpm@selenic.com merge3: fix argument order...	r346	merge: warning: conflicts during merge
		merging a
		merging a failed!
mpm@selenic.com update tests to reflect new short hash length...	r374	32e80765d7fe+75234512624c+ tip
mpm@selenic.com merge3: fix argument order...	r346	something else
		=======
		something
mpm@selenic.com Update test output for status change...	r748	M a

	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