Ville, I may have brought this up before, but I can't find anything about this in the archives and my local nnml backend searches. Where did vc-resolve-conflicts go? -- Adrian Aichner mailto:adrian at xemacs.org http://www.xemacs.org/
