diff .emacs @ 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 08af9e123baa
children 9a2541ec4d4d
line wrap: on
line diff