Mercurial > dotfiles

comparison .hgrc @ 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 20e47bc8eea9
comparison
equal deleted inserted replaced
375:81ca70aa5281 376:fe18716866e9
32 [ui] 32 [ui]
33 username = Augie Fackler <raf@durin42.com> 33 username = Augie Fackler <raf@durin42.com>
34 ignore = ~/.hgglobalignore 34 ignore = ~/.hgglobalignore
35 usehttp2=true 35 usehttp2=true
36 mergemarkers = detailed 36 mergemarkers = detailed
37
38 [merge-tools]
39 vimdiff.disable = yes
40 gvimdiff.disable = yes
37 41
38 [defaults] 42 [defaults]
39 annotate = -nu 43 annotate = -nu
40 serve = -v 44 serve = -v
41 45