From: Junio C Hamano <junkio@cox.net>
Date: Wed, 23 Nov 2005 19:48:20 GMT
Subject: Re: Problem merging
Message-ID: <7vsltn403f.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20051123085953.GA4933@c165.ib.student.liu.se>

Fredrik Kuivinen <freku045@student.liu.se> writes:

> Have you tried this merge with the recursive merge strategy?
>
> Btw is there a reason why 'recursive' isn't the default merge strategy
> for git-merge? It might be a bit confusing that git-pull and git-merge
> have different default strategies...

Agreed; will patch.