upstream/mercurial-mirror Files · contrib/merge-lists/Cargo.toml

histedit: byteify the help for the multifold action...

histedit: byteify the help for the multifold action While there's some allowance for str in `_()`, it's commented to be for "goofy unicode docstrings in test", so no idea how well that works, but it should at least come back as bytes. With HGPLAIN, however, the str isn't touched and is returned as-is, so this seems like a real bug.

Martin von Zweigbergk - - Load All Authors

File last commit:

r49874:681b25ea default


                r50786:e90767a7

stable

Download file

             Cargo.toml
        
                    21 lines
            
             | 599 B
            
                | application/toml
            
             |
                TOMLLexer
            
             / contrib / merge-lists / Cargo.toml
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # A tool that performs a 3-way merge, resolving conflicts in sorted lists and

      # leaving other conflicts unchanged. This is useful with Mercurial's support

      # for partial merge tools (configured in `[partial-merge-tools]`).

      [package]

      name = "merge-lists"

      version = "0.1.0"

      edition = "2021"

      # We need https://github.com/rust-lang/rust/pull/89825

      rust-version = "1.59"

      [dependencies]

      clap = { version = "3.1.6", features = ["derive"] }

      itertools = "0.10.3"

      regex = "1.5.5"

      similar = { version="2.1.0", features = ["bytes"] }

      [dev-dependencies]

      assert_cmd = "2.0.4"

      insta = "1.13.0"

      tempdir = "0.3.7"

	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

				# A tool that performs a 3-way merge, resolving conflicts in sorted lists and
				# leaving other conflicts unchanged. This is useful with Mercurial's support
				# for partial merge tools (configured in `[partial-merge-tools]`).

				[package]
				name = "merge-lists"
				version = "0.1.0"
				edition = "2021"
				# We need https://github.com/rust-lang/rust/pull/89825
				rust-version = "1.59"

				[dependencies]
				clap = { version = "3.1.6", features = ["derive"] }
				itertools = "0.10.3"
				regex = "1.5.5"
				similar = { version="2.1.0", features = ["bytes"] }

				[dev-dependencies]
				assert_cmd = "2.0.4"
				insta = "1.13.0"
				tempdir = "0.3.7"