Detect external file states/git changes.

[rgbkrk]

Recently I had a large set of merge conflicts on a branch I was working with another developer after they rebased.

I ran git reset --merge, and merge-conflicts left funny markers everywhere. It also says that I still have conflict markers left, even though they're all gone at this point.