After a 'git merge' in msysgit some stat information of the index doesn't match the working tree. Thus 'git diff' looks at files, which it shouldn't look at. I need to do a 'git update-index --refresh' before everything's in sync. Is this a know issue? Do other experience the same? You should basically be able to reproduce the behaviour by any merge (maybe non-fast-forward, I'm not sure). Steffen - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html