From: Jon Loeliger <jdl@freescale.com>
Date: Tue, 08 Nov 2005 03:07:13 GMT
Subject: Re: Expected Behavior?
Message-ID: <E1EZJpJ-0002S6-8S@jdl.com>


> 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