As in the "Cannot pull with rebase...?" thread, what does `git diff` say when 
run from the package directory? If you do `git checkout -- filename` on each of 
the files with changes, does `git diff` then show anything?

Reply via email to