TortoiseGit undid some changes during a pull.. :-/