upstream/mercurial-mirror Files · tests/test-merge-revert.out

merge with stable

Martin Geisler - - Load All Authors

File last commit:

r12156:4c94b6d0 default


                r12278:c4c2ba55

default

Download file

             test-merge-revert.out
        
                    23 lines
            
             | 611 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-merge-revert.out

History | Source | Raw |Copy content |Copy permalink

Martin Geisler tests: remove unneeded -d flags...	r12156	1:08a16e8e4408
		0:d29c767a4b52
		08a16e8e4408 tip
Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Martin Geisler tests: remove unneeded -d flags...	r12156	d29c767a4b52
		d29c767a4b52+
Vadim Gelfer rewrite revert command. fix issues 93, 123, 147....	r2029	reverting file1
Vadim Gelfer forgot to rerun tests after changed backup extension to .orig....	r2030	? file1.orig
Martin Geisler tests: remove unneeded -d flags...	r12156	d29c767a4b52
Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Vadim Gelfer forgot to rerun tests after changed backup extension to .orig....	r2030	? file1.orig
Martin Geisler tests: remove unneeded -d flags...	r12156	08a16e8e4408 tip
Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Matt Mackall merge: if filemerge skips merge, report as updated	r3400	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Vadim Gelfer forgot to rerun tests after changed backup extension to .orig....	r2030	? file1.orig
Martin Geisler tests: remove unneeded -d flags...	r12156	08a16e8e4408 tip
Vadim Gelfer forgot to rerun tests after changed backup extension to .orig....	r2030	? file1.orig
Martin Geisler tests: remove unneeded -d flags...	r12156	08a16e8e4408 tip
Vadim Gelfer forgot to rerun tests after changed backup extension to .orig....	r2030	? file1.orig
Martin Geisler tests: remove unneeded -d flags...	r12156	08a16e8e4408 tip
Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Vadim Gelfer forgot to rerun tests after changed backup extension to .orig....	r2030	? file1.orig
Martin Geisler tests: remove unneeded -d flags...	r12156	08a16e8e4408 tip

	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