upstream/mercurial-mirror Files · rust/chg/src/lib.rs

filemerge: be more strict when detecting conflict markers, add `|` markers...

filemerge: be more strict when detecting conflict markers, add `|` markers I received a user complaint about detecting a line that contained 78 `=` followed by `*/` as a conflict marker. We'll never generate that, we generate 7 identical characters and either the end of the line, or a space. Let's be explicit about detecting exactly what we produce to reduce the chances of a false positive. While we're here, add `|||||||` as a detected conflict marker (generated with the `keep-merge3` style conflicts). Differential Revision: https://phab.mercurial-scm.org/D11391

Yuya Nishihara - - Load All Authors

File last commit:

r45237:a347a329 default


                r48753:053dd53a

stable

Download file

             lib.rs
        
                    15 lines
            
             | 383 B
            
                | application/rls-services+xml
            
             |
                RustLexer
            
             / rust / chg / src / lib.rs
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      // Copyright 2018 Yuya Nishihara <yuya@tcha.org>

      //

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

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

      mod attachio;

      mod clientext;

      pub mod locator;

      pub mod message;

      pub mod procutil;

      mod runcommand;

      mod uihandler;

      pub use clientext::ChgClient;

      pub use uihandler::{ChgUiHandler, SystemHandler};

	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

				// Copyright 2018 Yuya Nishihara <yuya@tcha.org>
				//
				// This software may be used and distributed according to the terms of the
				// GNU General Public License version 2 or any later version.

				mod attachio;
				mod clientext;
				pub mod locator;
				pub mod message;
				pub mod procutil;
				mod runcommand;
				mod uihandler;

				pub use clientext::ChgClient;
				pub use uihandler::{ChgUiHandler, SystemHandler};