diff .elisp/settings/40.modes.el @ 195:e1a49db5c6ff

git-next-unmerged-file: also include "both modified" files
author Augie Fackler <durin42@gmail.com>
date Tue, 06 Apr 2010 15:07:46 -0500
parents fed1da889f84
children ccab2fe3a256
line wrap: on
line diff