Re: Rebase, please help
From: Alex Riesen <hidden>
Date: 2016-06-15 22:43:03
On 4/11/07, Junio C Hamano [off-list ref] wrote:
Also there is that small D/F conflict problem merge-recursive has that I told you about, which does not exist in git-apply ;-) Did you have a chance to take a look at it yet?
not yet. I was greatly distracted by subprojects