upstream/mercurial-mirror Files · mercurial/templates/static/coal-file.png

histedit: sniff-test for untracked file conflicts before prompting for rules...

histedit: sniff-test for untracked file conflicts before prompting for rules This bug is as old as histedit, which is more than 10 years! I'm a little sad about the extra calculations here that we're just going to throw out, but I don't see any better way to look for untracked file conflicts and I want the bug fixed. Differential Revision: https://phab.mercurial-scm.org/D6882

Dan Villiom Podlaski Christiansen - - Load All Authors

File last commit:

r9999:f91e5630 default


                r43247:699102b1

default

Download file

             coal-file.png
        
                    0 lines
            
             | 273 B
            
                | image/png
            
             |
                TextLexer

/ mercurial / templates / static / coal-file.png

History | Annotation | Raw

	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