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

contrib: migrate off of a couple of bitbucket URLs...

contrib: migrate off of a couple of bitbucket URLs I noticed this when diffing the thg installer against Mercurial to see what was missing. There are a handful of other URLs in i18n and extension example help text if anyone cares to update those. Differential Revision: https://phab.mercurial-scm.org/D12606

Martin von Zweigbergk - - Load All Authors

File last commit:

r49874:681b25ea default


                r50068:90f7d827

default

Download file

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

        Martin von Zweigbergk
    
contrib: add a partial-merge tool for sorted lists (such as Python imports)...

              r49874
            
      # 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

Martin von Zweigbergk contrib: add a partial-merge tool for sorted lists (such as Python imports)...	r49874	# 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"