From mboxrd@z Thu Jan  1 00:00:00 1970
From: Johannes Sixt <j6t@kdbg.org>
Subject: Re: git-gui is still using old-style git-merge invocation
Date: Thu, 29 Oct 2015 20:31:19 +0100
Message-ID: <56327407.2050607@kdbg.org>
References: <56325C58.1060007@kdbg.org>
 <1446141395.3199.2.camel@kaarsemaker.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit
To: Dennis Kaarsemaker <dennis@kaarsemaker.net>,
	Git Mailing List <git@vger.kernel.org>
X-From: git-owner@vger.kernel.org Thu Oct 29 20:31:30 2015
Return-path: <git-owner@vger.kernel.org>
Envelope-to: gcvg-git-2@plane.gmane.org
Received: from vger.kernel.org ([209.132.180.67])
	by plane.gmane.org with esmtp (Exim 4.69)
	(envelope-from <git-owner@vger.kernel.org>)
	id 1Zrsv2-0008VD-Cz
	for gcvg-git-2@plane.gmane.org; Thu, 29 Oct 2015 20:31:28 +0100
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1757528AbbJ2TbX (ORCPT <rfc822;gcvg-git-2@m.gmane.org>);
	Thu, 29 Oct 2015 15:31:23 -0400
Received: from bsmtp4.bon.at ([195.3.86.186]:50953 "EHLO bsmtp4.bon.at"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1756132AbbJ2TbW (ORCPT <rfc822;git@vger.kernel.org>);
	Thu, 29 Oct 2015 15:31:22 -0400
Received: from dx.site (unknown [93.83.142.38])
	by bsmtp4.bon.at (Postfix) with ESMTPSA id 3nmxhm4C2pz5tlK;
	Thu, 29 Oct 2015 20:31:20 +0100 (CET)
Received: from [IPv6:::1] (localhost [IPv6:::1])
	by dx.site (Postfix) with ESMTP id 19E5E5385;
	Thu, 29 Oct 2015 20:31:19 +0100 (CET)
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101
 Thunderbird/38.3.0
In-Reply-To: <1446141395.3199.2.camel@kaarsemaker.net>
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/280456>

Thanks!