upstream/mercurial-mirror Files · rust/hg-core/rustfmt.toml

mergestate: introduce a new ACTION_KEEP_NEW...

mergestate: introduce a new ACTION_KEEP_NEW `ACTION_KEEP` is overloaded and it's hard to figure out how we end up with this KEEP, what was the state of things. In a previous patch, we introduced `ACTION_KEEP_ABSENT` which represents files which are kept absent in the working directory. There is another special case where we keep the file when it's not present on both ancestor and remote side. We introduce a dedicated action for that. The goal is to use these information to make bid merge smarter. Differential Revision: https://phab.mercurial-scm.org/D9002

Georges Racinet - - Load All Authors

File last commit:

r40307:dbc28c91 default


                r46095:6877b0ee

default

Download file

             rustfmt.toml
        
                    3 lines
            
             | 66 B
            
                | application/toml
            
             |
                TOMLLexer
            
             / rust / hg-core / rustfmt.toml
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      max_width = 79

      wrap_comments = true

      error_on_line_overflow = true

	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

				max_width = 79
				wrap_comments = true
				error_on_line_overflow = true