diff lisp/ediff-merg.el @ 37142:e107572ba2dd

Undo last commit by John Wiegley.
author Gerd Moellmann <gerd@gnu.org>
date Mon, 02 Apr 2001 11:56:36 +0000 (2001-04-02)
parents 237411236185
children 7a94f1c588c4
line wrap: on
line diff