Re: Bug? - Unexpected lock file error

"Eric Raible" [off-list ref] 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.