upstream/mercurial-mirror Files · rust/hg-core/src/config.rs

diff: replace --merge option by config option...

diff: replace --merge option by config option I can't think of any reason you'd want to enable the merge diff on a run-to-run basis; you'd probably either always or never want it set (though I can't see why you'd never want it set). If you have it set, you'll probably also want the same output in `hg log -p` output. Having a single config option for the feature makes sense. Differential Revision: https://phab.mercurial-scm.org/D9956

Simon Sapin - - Load All Authors

File last commit:

r47212:2845892d default


                r47246:d57e607d

default

Download file

             config.rs
        
                    15 lines
            
             | 392 B
            
                | application/rls-services+xml
            
             |
                RustLexer
            
             / rust / hg-core / src / config.rs
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      // config.rs

      //

      // Copyright 2020

      //      Valentin Gatien-Baron,

      //      Raphaël Gomès <rgomes@octobus.net>

      //

      // This software may be used and distributed according to the terms of the

      // GNU General Public License version 2 or any later version.

      //! Mercurial config parsing and interfaces.

      mod config;

      mod layer;

      pub use config::Config;

      pub use layer::{ConfigError, ConfigParseError};

	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

				// config.rs
				//
				// Copyright 2020
				// Valentin Gatien-Baron,
				// Raphaël Gomès <rgomes@octobus.net>
				//
				// This software may be used and distributed according to the terms of the
				// GNU General Public License version 2 or any later version.

				//! Mercurial config parsing and interfaces.

				mod config;
				mod layer;
				pub use config::Config;
				pub use layer::{ConfigError, ConfigParseError};