From: Junio C Hamano Date: Sun, 05 Apr 2009 09:47:18 GMT Subject: Re: [PATCH 3/3] simplify output of conflicting merge Message-ID: <7vljqfv3dl.fsf@gitster.siamese.dyndns.org> In-Reply-To: <1238892420-721-4-git-send-email-drizzd@aon.at> Will queue, forking from maint. Thanks.