Subject: Re: need help with git show :1:...

From: layer <[email-masked]>
Date: Wed, 08 Apr 2009 10:57:55 -0700

I didn't make it clear, but I am in the process of resolve conflicts
from a merge in the repo where those commands were executed.