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

Incorporated most of Aron Griffis suggestions for sh compatibility.

Thomas Arendsen Hein - - Load All Authors

File last commit:

r801:1f9ec150 default


                r804:19388dcb

default

Download file

             test-merge1.out
        
                    45 lines
            
             | 832 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-merge1.out

History | Source | Raw |Copy content |Copy permalink

mpm@selenic.com [PATCH] Merging identical changes from another branch...	r407	+ hg init
		+ hg add a
Thomas Arendsen Hein Updated output of tests.	r801	+ hg commit -m commit #0 -d 0 0
mpm@selenic.com [PATCH] Merging identical changes from another branch...	r407	+ hg add b
Thomas Arendsen Hein Updated output of tests.	r801	+ hg commit -m commit #1 -d 0 0
mpm@selenic.com [PATCH] Merging identical changes from another branch...	r407	+ hg update 0
		+ hg add c
Thomas Arendsen Hein Updated output of tests.	r801	+ hg commit -m commit #2 -d 0 0
		+ hg update -m 1
mpm@selenic.com [PATCH] Merging identical changes from another branch...	r407	+ hg init
		+ hg add a
Thomas Arendsen Hein Updated output of tests.	r801	+ hg commit -m commit #0 -d 0 0
mpm@selenic.com [PATCH] Merging identical changes from another branch...	r407	+ hg add b
Thomas Arendsen Hein Updated output of tests.	r801	+ hg commit -m commit #1 -d 0 0
mpm@selenic.com [PATCH] Merging identical changes from another branch...	r407	+ hg update 0
		+ hg add c
Thomas Arendsen Hein Updated output of tests.	r801	+ hg commit -m commit #2 -d 0 0
		+ hg update -m 1
mpm@selenic.com [PATCH] Merging identical changes from another branch...	r407	merging for b
		merging b
		+ hg init
		+ hg add a
Thomas Arendsen Hein Updated output of tests.	r801	+ hg commit -m commit #0 -d 0 0
mpm@selenic.com [PATCH] Merging identical changes from another branch...	r407	+ hg add b
Thomas Arendsen Hein Updated output of tests.	r801	+ hg commit -m commit #1 -d 0 0
		+ hg commit -m commit #2 -d 0 0
mpm@selenic.com [PATCH] Merging identical changes from another branch...	r407	+ hg update 1
		+ hg add c
Thomas Arendsen Hein Updated output of tests.	r801	+ hg commit -m commit #3 -d 0 0
mpm@selenic.com Fix up test-merge1...	r430	This is file b1
Thomas Arendsen Hein Updated output of tests.	r801	+ hg update -m 2
mpm@selenic.com Fix up test-merge1...	r430	merging for b
		merging b
mpm@selenic.com [PATCH] Merging identical changes from another branch...	r407	+ hg init
		+ hg add a
Thomas Arendsen Hein Updated output of tests.	r801	+ hg commit -m commit #0 -d 0 0
mpm@selenic.com [PATCH] Merging identical changes from another branch...	r407	+ hg add b
Thomas Arendsen Hein Updated output of tests.	r801	+ hg commit -m commit #1 -d 0 0
		+ hg commit -m commit #2 -d 0 0
mpm@selenic.com [PATCH] Merging identical changes from another branch...	r407	+ hg update 1
		+ hg add c
Thomas Arendsen Hein Updated output of tests.	r801	+ hg commit -m commit #3 -d 0 0
		+ hg update -m 2
mpm@selenic.com [PATCH] Merging identical changes from another branch...	r407	merging for b
		merging b

	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