1. mirror
  2. mercurial-crew

Commits

Pierre-Yves David  committed f2b1f78

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.

  • Participants
  • Parent commits f6f35d6
  • Branches stable

Comments (0)

Files changed (1)

File contrib/mergetools.hgrc

View file
 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