| /vim-8.2.3635/src/libvterm/ |
| H A D | README | 21 To merge in changes from Github, do this:
23 - Setup the merge tool:
24 git config merge.tool vimdiff
25 git config merge.conflictstyle diff3
27 - Run the merge tool:
33 MERGED - best-effort merge of LOCAL and REMOTE
34 Now find places where automatic merge didn't work, they are marked with
|
| H A D | LICENSE | 10 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
| /vim-8.2.3635/runtime/syntax/ |
| H A D | gitcommit.vim | 60 syn match gitcommitWarning "\%^[^#].*: needs merge$" nextgroup=gitcommitWarning skipnl
61 syn match gitcommitWarning "^[^#].*: needs merge$" nextgroup=gitcommitWarning skipnl contained
|
| H A D | tidy.vim | 155 \ merge-emphasis mute-id ncr numeric-entities omit-optional-tags
167 syn keyword tidyAutoBooleanOption fix-bad-comments indent merge-divs merge-spans output-bom show-bo…
|
| H A D | gpg.vim | 71 \ merge-only no no-allow-non-selfsigned-uid
|
| H A D | eviews.vim | 43 …s makeresids makesignals makestates makestats makesystem map matrix means merge metafile ml model …
|
| H A D | json.vim | 133 …estriction, including without limitation the rights to use, copy, modify, merge, publish, distribu…
|
| H A D | htmlos.vim | 29 …etitem putitem switchitems gettable delrow delrows delcol delcols append merge fillcol fillrow fi…
|
| H A D | ps1.vim | 65 …tfrom|convertto|dismount|edit|expand|export|group|import|initialize|limit|merge|mount|out|publish|…
|
| H A D | clojure.vim | 32 …merge","clojure.core/merge-with","clojure.core/meta","clojure.core/method-sig","clojure.core/metho…
|
| H A D | lisp.vim | 281 syn keyword lispFunc debug merge subsetp
282 syn keyword lispFunc decf merge-pathname subst
283 syn keyword lispFunc declaim merge-pathnames subst-if
|
| H A D | vmasm.vim | 65 syn match vmasmOpcode "\<v[vs]merge\>"
|
| H A D | pov.vim | 18 syn keyword povCSG clipped_by composite contained_by difference intersection merge union
|
| H A D | nastran.vim | 69 syn keyword nastranDmapMatmod add add5 cead dcmp decomp diagonal fbs merge
|
| H A D | progress.vim | 210 …ue menu menu-bar menu-item menu-k[ey] menu-m[ouse] menubar merge-by-field merge-changes merge-row-…
|
| H A D | 8th.vim | 102 Builtin map= a:map= mean a:mean mean&variance a:mean&variance merge a:merge new a:new op! a:op! op…
211 Builtin keys m:keys len m:len map m:map merge m:merge new m:new op! m:op! open m:open slice m:slice
|
| /vim-8.2.3635/src/ |
| H A D | viminfo.c | 798 int merge = virp->vir_version >= VIMINFO_VERSION_WITH_HISTORY; in finish_viminfo_history() local
805 if (merge) in finish_viminfo_history()
822 write_viminfo_history(FILE *fp, int merge) in write_viminfo_history() argument
889 || !merge in write_viminfo_history()
2927 int merge = FALSE; in do_viminfo() local
2952 merge = TRUE; in do_viminfo()
2975 write_viminfo_history(fp_out, merge); in do_viminfo()
|
| /vim-8.2.3635/src/xpm/ |
| H A D | COPYRIGHT | 7 * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
|
| /vim-8.2.3635/runtime/autoload/ |
| H A D | clojurecomplete.vim | 12 …ap-indexed","map?","mapcat","mapv","max","max-key","memfn","memoize","merge","merge-with","meta","…
|
| /vim-8.2.3635/runtime/indent/ |
| H A D | sqlanywhere.vim | 79 \ 'case\|when\|merge\|exception'.
195 \ '\%(\<end\s\+\)\@<!\<case\>\|\<exception\>\|\<merge\>',
|
| /vim-8.2.3635/src/po/ |
| H A D | README_mvc.txt | 77 first thing to do is merge them into the existing translations. This is done
|
| H A D | README_mingw.txt | 47 This will extract all the strings from Vim and merge them in with the
|
| H A D | README.txt | 73 This will extract all the strings from Vim and merge them in with the
|
| /vim-8.2.3635/src/GvimExt/ |
| H A D | README.txt | 20 registry entries, right-click the gvimext.reg file and choose the "merge"
|
| /vim-8.2.3635/runtime/ftplugin/ |
| H A D | sql.vim | 321 " merge
359 \ '\<merge\>:' .
|