upstream/mercurial-mirror Files · tests/test-up-issue1456.out

record: check that we are not committing a merge before patch selection...

record: check that we are not committing a merge before patch selection It might sound like a good idea to use record to filter changes when merging. If someone attemps this, it's better to tell her "no" right ahead, before the patch generation/line selection, so she does not spend time doing it just to receive a red light after that (sometimes rather long) process.

Matt Mackall - - Load All Authors

File last commit:

r8855:f331de88 default


                r11237:feb2a58f

stable

Download file

             test-up-issue1456.out
        
                    8 lines
            
             | 319 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-up-issue1456.out

History | Annotation | Raw |Copy content |Copy permalink

				abort: uncommitted local changes
				dirty
				M foo
				% validate update of standalone execute bit change
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				nothing changed
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved

	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