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

commit: when committing the results of a merge, it's all or nothing...

commit: when committing the results of a merge, it's all or nothing Previously, it was possible to commit just one file from a merge, which is essentially always the wrong thing to do. This fixes issue 1049.

Dirkjan Ochtman - - Load All Authors

File last commit:

r6336:4b0c9c67 default


                r6385:0d4e068e

default

Download file

             test-issue612.out
        
                    11 lines
            
             | 315 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-issue612.out

History | Annotation | Raw |Copy content |Copy permalink

				adding src/a.c
				moving src/a.c to source/a.c
				1 files updated, 0 files merged, 1 files removed, 0 files unresolved
				created new head
				? src/a.o
				merging src/a.c and source/a.c
				1 files updated, 1 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)
				M source/a.c
				R src/a.c
				? source/a.o

	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