From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jon Loeliger <jdl@freescale.com>
Subject: Re: Expected Behavior?
Date: Mon, 07 Nov 2005 21:07:13 -0600
Message-ID: <E1EZJpJ-0002S6-8S@jdl.com>
X-From: git-owner@vger.kernel.org Tue Nov 08 04:09:19 2005
Return-path: <git-owner@vger.kernel.org>
Received: from vger.kernel.org ([209.132.176.167])
	by ciao.gmane.org with esmtp (Exim 4.43)
	id 1EZJpP-0002v2-T8
	for gcvg-git@gmane.org; Tue, 08 Nov 2005 04:07:20 +0100
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S965278AbVKHDHP (ORCPT <rfc822;gcvg-git@m.gmane.org>);
	Mon, 7 Nov 2005 22:07:15 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S965282AbVKHDHP
	(ORCPT <rfc822;git-outgoing>); Mon, 7 Nov 2005 22:07:15 -0500
Received: from mail.jdl.com ([66.118.10.122]:53190 "EHLO jdl.com")
	by vger.kernel.org with ESMTP id S965278AbVKHDHN (ORCPT
	<rfc822;git@vger.kernel.org>); Mon, 7 Nov 2005 22:07:13 -0500
Received: from jdl (helo=jdl.com)
	by jdl.com with local-esmtp (Exim 4.44)
	id 1EZJpJ-0002S6-8S
	for git@vger.kernel.org; Mon, 07 Nov 2005 21:07:13 -0600
To: git@vger.kernel.org
In-Reply-To: 7vd5ldusg7.fsf@assigned-by-dhcp.cox.net
X-Spam-Score: -105.9 (---------------------------------------------------)
Sender: git-owner@vger.kernel.org
Precedence: bulk
X-Mailing-List: git@vger.kernel.org
Archived-At: <http://permalink.gmane.org/gmane.comp.version-control.git/11307>


> It appears that as the everyday workhorse, using Daniel's
> git-merge-resolve is stable through git-merge have proven stable
> enough.  So here is a question.  Do people mind if 'git-resolve'
> and 'git-octopus' are dropped before 1.0?  This means 2 less
> programs in your /usr/bin ;-).

It's OK with me. :-)

jdl