upstream/mercurial-mirror Files · contrib/chg/chg.1

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

Joerg Sonnenberger - - Load All Authors

File last commit:

r47557:28382885 default


                r49398:60a06b0d

default

Download file

             chg.1
        
                    41 lines
            
             | 1.2 KiB
            
                | application/x-troff
            
             |
                GroffLexer
            
             / contrib / chg / chg.1
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      .\"                                      Hey, EMACS: -*- nroff -*-

      .\" First parameter, NAME, should be all caps

      .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection

      .\" other parameters are allowed: see man(7), man(1)

      .TH CHG 1 "March 3, 2013"

      .\" Please adjust this date whenever revising the manpage.

      .\"

      .\" Some roff macros, for reference:

      .\" .nh        disable hyphenation

      .\" .hy        enable hyphenation

      .\" .ad l      left justify

      .\" .ad b      justify to both left and right margins

      .\" .nf        disable filling

      .\" .fi        enable filling

      .\" .br        insert line break

      .\" .sp <n>    insert n+1 empty lines

      .\" for manpage-specific macros, see man(7)

      .SH NAME

      chg \- a fast client for Mercurial command server

      .SH SYNOPSIS

      .B chg

      .IR command " [" options "] [" arguments "]..."

      .br

      .SH DESCRIPTION

      The

      .B chg

      command is the wrapper for

      .B hg

      command.

      It uses the Mercurial command server to reduce start-up overhead.

      .SH OPTIONS

      This program accepts the same command line syntax as the

      .B hg

      command. Additionally it accepts the following options.

      .TP

      .B \-\-kill\-chg\-daemon

      Terminate the background command servers.

      .SH SEE ALSO

      .BR hg (1)

      .SH AUTHOR

      Written by Yuya Nishihara <yuya@tcha.org>.

	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

				.\" Hey, EMACS: -- nroff --
				.\" First parameter, NAME, should be all caps
				.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
				.\" other parameters are allowed: see man(7), man(1)
				.TH CHG 1 "March 3, 2013"
				.\" Please adjust this date whenever revising the manpage.
				.\"
				.\" Some roff macros, for reference:
				.\" .nh disable hyphenation
				.\" .hy enable hyphenation
				.\" .ad l left justify
				.\" .ad b justify to both left and right margins
				.\" .nf disable filling
				.\" .fi enable filling
				.\" .br insert line break
				.\" .sp <n> insert n+1 empty lines
				.\" for manpage-specific macros, see man(7)
				.SH NAME
				chg \- a fast client for Mercurial command server
				.SH SYNOPSIS
				.B chg
				.IR command " [" options "] [" arguments "]..."
				.br
				.SH DESCRIPTION
				The
				.B chg
				command is the wrapper for
				.B hg
				command.
				It uses the Mercurial command server to reduce start-up overhead.
				.SH OPTIONS
				This program accepts the same command line syntax as the
				.B hg
				command. Additionally it accepts the following options.
				.TP
				.B \-\-kill\-chg\-daemon
				Terminate the background command servers.
				.SH SEE ALSO
				.BR hg (1)
				.SH AUTHOR
				Written by Yuya Nishihara <yuya@tcha.org>.