diff lisp/ediff-merg.el @ 100328:3cfd649195fe

Fix whitespace breakage by bug#870 (and it wasn't even me, this time).
author Juanma Barranquero <lekktu@gmail.com>
date Wed, 10 Dec 2008 16:31:26 +0000
parents d42aff5ca541
children a9dc0e7c3f2b
line wrap: on
line diff