mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 07:17:55 +03:00
mergetools: vimdiff issue a warning explaining how to abort
Adds a message displayed at each vimdiff invocation: merge conflict detected, type ":cq" to abort Vimdiff is very confusing for non-vim user (not to speak about vim user confused anyway. However it is very likely that vimdiff is picked as the mergetool of choice when using the default config: - vim is available on all UNIX system. - Its one of the rare non graphical merge tools.
This commit is contained in:
parent
f8a85d58db
commit
f1f7fda13e
@ -15,7 +15,7 @@ gvimdiff.regkeyalt=Software\Wow6432Node\Vim\GVim
|
||||
gvimdiff.regname=path
|
||||
gvimdiff.priority=-9
|
||||
|
||||
vimdiff.args=$local $other $base
|
||||
vimdiff.args=$local $other $base -c 'echohl WarningMsg | echo "merge conflict detected, type \":cq\" to abort" | echohl'
|
||||
vimdiff.check=changed
|
||||
vimdiff.priority=-10
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user