[Emacs-commit] emacs/lisp pcvs-parse.el

[Stefan Monnier]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier+gnu/address@hidden>     02/03/17 
15:48:14

Modified files:
        lisp           : pcvs-parse.el 

Log message:
        (cvs-parse-table): Be a bit more lenient.
        (cvs-parse-status): Handle the "used to have a conflict" marker.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/pcvs-parse.el.diff?tr1=1.10&tr2=1.11&r1=text&r2=text