From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sat, 01 Jul 2006 15:23:11 GMT
Subject: Re: A note on merging conflicts..
Message-ID: <Pine.LNX.4.63.0607011722360.29667@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <20060701150926.GA25800@lsrfire.ath.cx>

Hi,

On Sat, 1 Jul 2006, Rene Scharfe wrote:

> +				exclude = get_merge_bases(a, b);

Aaah! Junio, Linus, I see the light now.

Ciao,
Dscho