Poor status output during conflicted merge

Let's create a merge conflict and then partially resolve it:

git init bad-status cd bad-status/ echo 1 > file git add file git commit -a -m1 echo 2 > file git commit -a -m2 git checkout -b topic HEAD^ echo 3 > file git commit -a -m3 git merge master git checkout --ours file git add file

A 'git status' at this point gives the following output:

# On branch topic nothing to commit (working directory clean)

Which is wrong, since the merge still needs to be committed.

- Eric