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

merge: fix adding untracked files on directory rename (issue612)...

merge: fix adding untracked files on directory rename (issue612) Fix from Brendan Added test case

Matt Mackall - - Load All Authors

File last commit:

r4819:97971245 default


                r4819:97971245

default

Download file

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

/ tests / test-issue612.out

History | Annotation | Raw |Copy content |Copy permalink

				adding src/a.c
				copying src/a.c to source/a.c
				removing src/a.c
				1 files updated, 0 files merged, 1 files removed, 0 files unresolved
				? 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