I'm using Piston with Git. When I have local modifications to one of
my vendored projects, and I run a piston update, it leaves files in
the index with merge conflict markers. Since these files are already
in the Git index, git doesn't warn me that they are unmerged.
I would have expected it to warn me and leave them unmerged (like a
'git merge' with merge conflicts would)...