upstream/mercurial-mirror Files · contrib/asv.conf.json

merge: consider the file merged when using :merge-{local,other}...

merge: consider the file merged when using :merge-{local,other} Returning `None` from `simplemerge()` means that the caller interprets it as "no merge was necessary (because two sides matched)". See and issue2680 for some background. However, `simplemerge()` shouldn't even get called in such scenarios, and returning `None` means that the file is not considered merged, even though the contents actually were. See the affected test cases. Differential Revision: https://phab.mercurial-scm.org/D11999

Philippe Pepiot - - Load All Authors

File last commit:

r30406:cff0f592 default


                r49415:50de0890

default

Download file

             asv.conf.json
        
                    13 lines
            
             | 397 B
            
                | application/json
            
             |
                JsonLexer
            
             / contrib / asv.conf.json
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      {

          "version": 1,

          "project": "mercurial",

          "project_url": "https://mercurial-scm.org/",

          "repo": "..",

          "branches": ["default", "stable"],

          "environment_type": "virtualenv",

          "show_commit_url": "https://www.mercurial-scm.org/repo/hg/rev/",

          "benchmark_dir": "benchmarks",

          "env_dir": "../.asv/env",

          "results_dir": "../.asv/results",

          "html_dir": "../.asv/html"

      }

	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

				{
				"version": 1,
				"project": "mercurial",
				"project_url": "https://mercurial-scm.org/",
				"repo": "..",
				"branches": ["default", "stable"],
				"environment_type": "virtualenv",
				"show_commit_url": "https://www.mercurial-scm.org/repo/hg/rev/",
				"benchmark_dir": "benchmarks",
				"env_dir": "../.asv/env",
				"results_dir": "../.asv/results",
				"html_dir": "../.asv/html"
				}