upstream/mercurial-mirror Files · contrib/editmergeps.bat

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

Kostia Balytskyi - - Load All Authors

File last commit:

r32568:4b9b8793 default


                r49415:50de0890

default

Download file

             editmergeps.bat
        
                    2 lines
            
             | 102 B
            
                | application/x-msdownload
            
             |
                BatchLexer
            
             / contrib / editmergeps.bat
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Kostia Balytskyi
    
contrib: add editmerge version for powershell...

              r32329
            
      @echo off

        Kostia Balytskyi
    
contrib: run editmergeps.ps1 from the same location as editmergeps.bat...

              r32568
            
      powershell -NoProfile -ExecutionPolicy unrestricted -Command "& '%~dp0\editmergeps.ps1' %*"

	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

Kostia Balytskyi contrib: add editmerge version for powershell...	r32329	@echo off
Kostia Balytskyi contrib: run editmergeps.ps1 from the same location as editmergeps.bat...	r32568	powershell -NoProfile -ExecutionPolicy unrestricted -Command "& '%~dp0\editmergeps.ps1' %*"