From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 05 Dec 2006 18:36:36 GMT
Subject: Re: using xdl_merge(), was Re: Resolving conflicts
Message-ID: <Pine.LNX.4.63.0612051926360.28348@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <4575B32F.5060108@ramsay1.demon.co.uk>

Hi,

On Tue, 5 Dec 2006, Ramsay Jones wrote:

> Have you had time to look at my test cases?

Not really. Besides, I did _not_ implement a full diff3, but _just_ the 
merge. I.e. my function does not output anything, but (in theory) fills a 
buffer with what merge would have written into the first file.

However, once I understand how your tests work, I'll try to concoct a test 
script for git-with-xdl_merge.

Ciao,