upstream/mercurial-mirror Files · contrib/vim/HGAnnotate.vim

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

"Mathieu Clabaut " - - Load All Authors

File last commit:

r2591:61f2008c default


                r49415:50de0890

default

Download file

             HGAnnotate.vim
        
                    27 lines
            
             | 859 B
            
                | text/x-vim
            
             |
                VimLexer
            
             / contrib / vim / HGAnnotate.vim
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      " $Id: CVSAnnotate.vim,v 1.5 2002/10/01 21:34:02 rhiestan Exp $

      " Vim syntax file

      " Language:	CVS annotate output

      " Maintainer:	Bob Hiestand <bob@hiestandfamily.org>

      " Last Change:	$Date: 2002/10/01 21:34:02 $

      " Remark:	Used by the cvscommand plugin.  Originally written by Mathieu

      " Clabaut

      if version < 600

        syntax clear

      elseif exists("b:current_syntax")

        finish

      endif

      syn match cvsDate 	/\S\S\S \S\+ \d\+ \d\+:\d\+:\d\+ \d\+ [+-]\?\d\+/ contained

      syn match cvsName  	/^\s*\S\+ / 		contained nextgroup=cvsVer

      syn match cvsVer 	/\d\+ / 		contained nextgroup=cvsDate

      syn region cvsHead 	start="^" end=":" 	contains=cvsVer,cvsName,cvsDate

      if !exists("did_cvsannotate_syntax_inits")

      let did_cvsannotate_syntax_inits = 1

      hi link cvsText 	String

      hi link cvsDate 	Comment

      hi link cvsName	Type

      hi link cvsVer	Statement

      endif

      let b:current_syntax="CVSAnnotate"

	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

				" $Id: CVSAnnotate.vim,v 1.5 2002/10/01 21:34:02 rhiestan Exp $
				" Vim syntax file
				" Language: CVS annotate output
				" Maintainer: Bob Hiestand <bob@hiestandfamily.org>
				" Last Change: $Date: 2002/10/01 21:34:02 $
				" Remark: Used by the cvscommand plugin. Originally written by Mathieu
				" Clabaut
				if version < 600
				syntax clear
				elseif exists("b:current_syntax")
				finish
				endif

				syn match cvsDate /\S\S\S \S\+ \d\+ \d\+:\d\+:\d\+ \d\+ [+-]\?\d\+/ contained
				syn match cvsName /^\s*\S\+ / contained nextgroup=cvsVer
				syn match cvsVer /\d\+ / contained nextgroup=cvsDate
				syn region cvsHead start="^" end=":" contains=cvsVer,cvsName,cvsDate

				if !exists("did_cvsannotate_syntax_inits")
				let did_cvsannotate_syntax_inits = 1
				hi link cvsText String
				hi link cvsDate Comment
				hi link cvsName Type
				hi link cvsVer Statement
				endif

				let b:current_syntax="CVSAnnotate"