Make sure we error out if we can't remove a file on automatic merges.