The following pastebin is a repo with one file with one, two, three, four, five typed on each line.

Each line was commited separately into git:

http://pastebin.ca/raw/2136179

I then tried to delete the line two with the command git revert <commmit which creates two>

And get:

error: could not revert b4e0a66... second
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'

There should be no conflict for something this simple? Or am I doing it wrong/got the wrong command?

The merge details don't seem to make sense either:

one
<<<<<<< HEAD
two
three
four
five
=======
>>>>>>> parent of b4e0a66... second

Isn't that saying delete everything but one? I was expecting only two to be affected...

git 1.7.10