Fixing push-and-diff, which was half-commented-out.