annotate .zfun/_mercurial @ 376:fe18716866e9

hgrc: disable vimdiff as a merge tool forever
author Augie Fackler <raf@durin42.com>
date Sun, 31 Jan 2016 20:36:18 -0500
parents 4e25b698e3e3
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
293
4e25b698e3e3 _hg: symlink as _mercurial as well to fix weird behavior on Ubuntu
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
1 _hg