\s
* test/lisp/vc/log-edit-tests.el (log-edit-fill-entry-confinement) (log-edit-fill-entry-space-substitution) (log-edit-fill-entry-initial-wrapping): Replace literal space character with '\s', to avoid tripping up merge scripts.