upstream/mercurial-mirror Files · tests/test-rebase-abort.out

extdiff: merge node and working dir snapshot modes

Stefano Tortarolo - - Load All Authors

File last commit:

r6906:808f03f6 default


                r8064:5c7bc1ae

default

Download file

             test-rebase-abort.out
        
                    31 lines
            
             | 395 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-rebase-abort.out

History | Annotation | Raw |Copy content |Copy permalink

				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				created new head
				@ 4: L2
				\|
				o 3: L1
				\|
				\| o 2: C3
				\|/
				o 1: C2
				\|
				o 0: C1


				% Conflicting rebase
				merging common
				warning: conflicts during merge.
				merging common failed!
				abort: fix unresolved conflicts with hg resolve then run hg rebase --continue

				% Abort
				rebase aborted
				@ 4: L2
				\|
				o 3: L1
				\|
				\| o 2: C3
				\|/
				o 1: C2
				\|
				o 0: C1

	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