comparison .shell.d/50.editorsetup.sh @ 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 9a3af00d8eaa
children c911585b7a7b
comparison
equal deleted inserted replaced
194:cf3ba8f57434 195:e1a49db5c6ff