completion: complete --remerge-diff