upstream/mercurial-mirror Files · rust/Cargo.toml

filemerge: when merge tool uses $output, don't leave markers in $local...

filemerge: when merge tool uses $output, don't leave markers in $local As explained in the previous patch, we incorrectly leave conflict markers in both `$local` and `$output` since D12190. I don't understand why it broke but the fix is simple and clear after all the recent refactoring. Differential Revision: https://phab.mercurial-scm.org/D12379

Antoine Cezar - - Load All Authors

File last commit:

r45503:cf04f62d default


                r49823:a54a8663

stable

Download file

             Cargo.toml
        
                    3 lines
            
             | 82 B
            
                | text/plain
            
             |
                TOMLLexer
            
             / rust / Cargo.toml
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      [workspace]

      members = ["hg-core", "hg-cpython", "rhg"]

      exclude = ["chg", "hgcli"]

	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

				[workspace]
				members = ["hg-core", "hg-cpython", "rhg"]
				exclude = ["chg", "hgcli"]