upstream/mercurial-mirror Files · rust/rhg/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

Raphaël Gomès - - Load All Authors

File last commit:

r49807:8848c345 default


                r49823:a54a8663

stable

Download file

             Cargo.toml
        
                    23 lines
            
             | 440 B
            
                | application/toml
            
             |
                TOMLLexer
            
             / rust / rhg / Cargo.toml
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      [package]

      name = "rhg"

      version = "0.1.0"

      authors = [

          "Antoine Cezar <antoine.cezar@octobus.net>",

          "Raphaël Gomès <raphael.gomes@octobus.net>",

      ]

      edition = "2018"

      [dependencies]

      atty = "0.2"

      hg-core = { path = "../hg-core"}

      chrono = "0.4.19"

      clap = "2.33.1"

      derive_more = "0.99"

      home = "0.5.3"

      lazy_static = "1.4.0"

      log = "0.4.11"

      micro-timer = "0.3.1"

      regex = "1.3.9"

      env_logger = "0.7.1"

      format-bytes = "0.3.0"

      users = "0.11.0"

	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

				[package]
				name = "rhg"
				version = "0.1.0"
				authors = [
				"Antoine Cezar <antoine.cezar@octobus.net>",
				"Raphaël Gomès <raphael.gomes@octobus.net>",
				]
				edition = "2018"

				[dependencies]
				atty = "0.2"
				hg-core = { path = "../hg-core"}
				chrono = "0.4.19"
				clap = "2.33.1"
				derive_more = "0.99"
				home = "0.5.3"
				lazy_static = "1.4.0"
				log = "0.4.11"
				micro-timer = "0.3.1"
				regex = "1.3.9"
				env_logger = "0.7.1"
				format-bytes = "0.3.0"
				users = "0.11.0"