diff lisp/ediff-mult.el @ 43974:36f11755a3d6

(cvs-parse-table): Be a bit more lenient. (cvs-parse-status): Handle the "used to have a conflict" marker.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Sun, 17 Mar 2002 20:48:14 +0000
parents 1c34b0b56515
children 182881d68883
line wrap: on
line diff