lists.zerezo.com
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Bug? - Unexpected lock file error
- Date: Fri, 05 Sep 2008 16:47:31 -0700
- From: Junio C Hamano <gitster@xxxxxxxxx>
- Subject: Re: Bug? - Unexpected lock file error
"Eric Raible" <raible@xxxxxxxxx> 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.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html