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

Yuya Nishihara - - Load All Authors

File last commit:

r45238:9fc9526e default


                r49823:a54a8663

stable

Download file

             Cargo.toml
        
                    22 lines
            
             | 474 B
            
                | application/toml
            
             |
                TOMLLexer
            
             / rust / chg / Cargo.toml
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      [package]

      name = "chg"

      version = "0.1.0"

      authors = ["Yuya Nishihara <yuya@tcha.org>"]

      description = "Client for Mercurial command server with cHg extension"

      license = "GPL-2.0+"

      edition = "2018"

      [dependencies]

      async-trait = "0.1"

      bytes = "0.5"

      futures = "0.3"

      libc = "0.2"

      log = { version = "0.4", features = ["std"] }

      tokio-hglib = "0.3"

      [dependencies.tokio]

      version = "0.2"

      features = ["rt-core", "io-util", "time", "process", "macros"]

      [build-dependencies]

      cc = "1.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 = "chg"
				version = "0.1.0"
				authors = ["Yuya Nishihara <yuya@tcha.org>"]
				description = "Client for Mercurial command server with cHg extension"
				license = "GPL-2.0+"
				edition = "2018"

				[dependencies]
				async-trait = "0.1"
				bytes = "0.5"
				futures = "0.3"
				libc = "0.2"
				log = { version = "0.4", features = ["std"] }
				tokio-hglib = "0.3"

				[dependencies.tokio]
				version = "0.2"
				features = ["rt-core", "io-util", "time", "process", "macros"]

				[build-dependencies]
				cc = "1.0"