diff .shell.d/50.common_env.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 9b48ec89ffdf
children 5599a864b888
line wrap: on
line diff