From: Martin Langhoff <martin.langhoff@gmail.com>
Date: Wed, 19 Oct 2005 11:21:47 GMT
Subject: Fwd: cg-merge should use git-merge
Message-ID: <46a038f90510190421l50b2c12k495db23b62015782@mail.gmail.com>
In-Reply-To: <46a038f90510161644l35119401rdc05c081506ae715@mail.gmail.com>

Resending a post that never made it to the list due to a bug at my
end, and I think warrants some more discussion. Unfortunately, I'm
bug-fixing at the moment, so implementing this has taken a backseat.

---------- Forwarded message ----------
From: Martin Langhoff <martin.langhoff@gmail.com>
Date: Oct 17, 2005 12:44 PM
Subject: cg-merge should use git-merge
To: Petr Baudis <pasky@ucw.cz>, Git Mailing List <git@vger.kernel.org>


Petr,

After using git-merge a few times by hand to test-drive the new merge
drivers, I'm sold on the idea, and I 'd like to have cg-merge use
git-merge directly. I'll try and find the time one of these evenings
to outline something, but I guess it's pretty core to Cogito, so I'm
after some direction from you ;)



martin