From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 05 Sep 2008 23:47:31 GMT
Subject: Re: Bug? - Unexpected lock file error
Message-ID: <7v63paupd8.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <279b37b20809051622q6b3ab37tec3f1726c71952e4@mail.gmail.com>

"Eric Raible" <raible@gmail.com> writes:

> If 'empty' has any commits then the merge happens as expected.

I think it is a bug in the git-merge rewritten in C, in "Already
uptodate!" codepath.