[XEmacs 21.5b16] does vc-merge work?