From mboxrd@z Thu Jan  1 00:00:00 1970
From: Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH 3/3] simplify output of conflicting merge
Date: Sun, 05 Apr 2009 02:47:18 -0700
Message-ID: <7vljqfv3dl.fsf@gitster.siamese.dyndns.org>
References: <20090401180627.GA14716@localhost>
 <1238892420-721-1-git-send-email-drizzd@aon.at>
 <1238892420-721-2-git-send-email-drizzd@aon.at>
 <1238892420-721-3-git-send-email-drizzd@aon.at>
 <1238892420-721-4-git-send-email-drizzd@aon.at>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: git@vger.kernel.org, Miklos Vajna <vmiklos@frugalware.org>,
	Michael Johnson <redbeard@mdjohnson.us>,
	Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Clemens Buchacher <drizzd@aon.at>
X-From: git-owner@vger.kernel.org Sun Apr 05 11:49:02 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 1LqOyJ-0007h0-WF
	for gcvg-git-2@gmane.org; Sun, 05 Apr 2009 11:49:00 +0200
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1756849AbZDEJr3 (ORCPT <rfc822;gcvg-git-2@m.gmane.org>);
	Sun, 5 Apr 2009 05:47:29 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756837AbZDEJr2
	(ORCPT <rfc822;git-outgoing>); Sun, 5 Apr 2009 05:47:28 -0400
Received: from a-sasl-quonix.sasl.smtp.pobox.com ([208.72.237.25]:53713 "EHLO
	sasl.smtp.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1756317AbZDEJr1 (ORCPT <rfc822;git@vger.kernel.org>);
	Sun, 5 Apr 2009 05:47:27 -0400
Received: from localhost.localdomain (unknown [127.0.0.1])
	by a-sasl-quonix.sasl.smtp.pobox.com (Postfix) with ESMTP id 1C662C1CB;
	Sun,  5 Apr 2009 05:47:26 -0400 (EDT)
Received: from pobox.com (unknown [68.225.240.211]) (using TLSv1 with cipher
 DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by
 a-sasl-quonix.sasl.smtp.pobox.com (Postfix) with ESMTPSA id 4EB1DC1C8; Sun, 
 5 Apr 2009 05:47:20 -0400 (EDT)
User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/21.4 (gnu/linux)
X-Pobox-Relay-ID: C50F9A64-21C6-11DE-B550-DD19768B9EAE-77302942!a-sasl-quonix.pobox.com
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/115647>

Will queue, forking from maint.  Thanks.