comparison .elisp/settings/50.localfuncs.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 e77c01b7b0f4
children c965d5dbd868
comparison
equal deleted inserted replaced
194:cf3ba8f57434 195:e1a49db5c6ff