builtin-merge: fix a typo in an error message