From: layer <layer@known.net>
Date: Wed, 08 Apr 2009 17:57:55 GMT
Subject: Re: need help with git show :1:...
Message-ID: <7101.1239213475@relay.known.net>

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.