Mercurial > dotfiles

changeset 376:fe18716866e9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgrc: disable vimdiff as a merge tool forever
author Augie Fackler <raf@durin42.com>
date Sun, 31 Jan 2016 20:36:18 -0500
parents 81ca70aa5281
children 117e3c11d953
files .hgrc
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.hgrc
+++ b/.hgrc
@@ -35,6 +35,10 @@ ignore = ~/.hgglobalignore
 usehttp2=true
 mergemarkers = detailed
 
+[merge-tools]
+vimdiff.disable = yes
+gvimdiff.disable = yes
+
 [defaults]
 annotate = -nu
 serve = -v