Re: Problem merging

Fredrik Kuivinen [off-list ref] 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.