From mboxrd@z Thu Jan  1 00:00:00 1970
From: layer <layer@known.net>
Subject: Re: need help with git show :1:...
Date: Wed, 08 Apr 2009 10:57:55 -0700
Message-ID: <7101.1239213475@relay.known.net>
To: git@vger.kernel.org
X-From: git-owner@vger.kernel.org Wed Apr 08 20:00:14 2009
Return-path: <git-owner@vger.kernel.org>
Envelope-to: gcvg-git-2@gmane.org
Received: from vger.kernel.org ([209.132.176.167])
	by lo.gmane.org with esmtp (Exim 4.50)
	id 1Lrc4L-0007x0-TZ
	for gcvg-git-2@gmane.org; Wed, 08 Apr 2009 20:00:14 +0200
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S934670AbZDHR56 (ORCPT <rfc822;gcvg-git-2@m.gmane.org>);
	Wed, 8 Apr 2009 13:57:58 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932434AbZDHR55
	(ORCPT <rfc822;git-outgoing>); Wed, 8 Apr 2009 13:57:57 -0400
Received: from relay.known.net ([67.121.255.169]:51024 "HELO relay.known.net"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP
	id S1758354AbZDHR54 (ORCPT <rfc822;git@vger.kernel.org>);
	Wed, 8 Apr 2009 13:57:56 -0400
Received: from localhost (127.0.0.1) by relay.known.net
    (Allegro Maild v1.2.17) id 000000034332; Wed, 8 Apr 2009 10:57:55 -0700
Sender: git-owner@vger.kernel.org
Precedence: bulk
List-ID: <git.vger.kernel.org>
X-Mailing-List: git@vger.kernel.org
Archived-At: <http://permalink.gmane.org/gmane.comp.version-control.git/116099>

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.