register-comparator.diff
remove-template-id-in-ctor.diff
