Just a bit more info. If I do a 
    git fetch
and then 
    git diff -- <path-to-problem-file>
I get no difference. But git still says I have unmerged changes.

You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.

Reply via email to