diff .elisp/settings/10.require.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 616075bfadb5
children 8980dc2deda0
line wrap: on
line diff