From: layer <layer@known.net>
Date: Wed, 08 Apr 2009 23:40:26 GMT
Subject: "git status <file>" in the middle of a merge
Message-ID: <10804.1239234026@relay.known.net>

$ git status ChangeLog
fatal: cannot do a partial commit during a merge.
$ 

Huh?  I'm not committing.  I'm asking for status.

Doing "git status" will tell me it's `unmerged'.