Mercurial > dotfiles

diff .hgrc @ 386:40c0bc5ff266

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hg: really end vimdiff's reign of terror In fe18716866 I left off the trailing 'd' on 'disabled', because I forgot how my own change to core Mercurial worked.
author Augie Fackler <raf@durin42.com>
date Mon, 14 Mar 2016 22:03:27 -0400
parents 20e47bc8eea9
children cf3b1ba01e69
line wrap: on
line diff
--- a/.hgrc
+++ b/.hgrc
@@ -34,8 +34,8 @@ usehttp2=true
 mergemarkers = detailed
 
 [merge-tools]
-vimdiff.disable = yes
-gvimdiff.disable = yes
+vimdiff.disabled = yes
+gvimdiff.disabled = yes
 
 [defaults]
 annotate = -nu