Trim task can now handle files that git senses have moved