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

simplify filterfiles when filtering based on a directory...

simplify filterfiles when filtering based on a directory since an unkown files cannot be an exact match, we bisect for a <path>/ instead of <path> and we get only the files below the directory.

Thomas Arendsen Hein - - Load All Authors

File last commit:

r2175:b2ae81a7 default


                r2486:3ea8111e

default

Download file

             test-merge5.out
        
                    6 lines
            
             | 252 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-merge5.out

History | Annotation | Raw |Copy content |Copy permalink

				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				removing b
				this update spans a branch affecting the following files:
				b
				aborting update spanning branches!
				(use 'hg merge' to merge across branches or 'hg update -C' to lose changes)

	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