log lisp/ediff/ediff-merg.el @ 129:e292c9648bb9 xemacs-20-1p3

age author description
Mon, 13 Aug 2007 09:07:36 +0200 cvs Import from CVS: tag r20-0b91 r20-0b91