diff lisp/ediff-merg.el @ 96161:080aa0038255

(witness-emacs): Tell lisp to use bootstrap-emacs.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Sat, 21 Jun 2008 19:32:57 +0000
parents eebbd7f32937
children d42aff5ca541
line wrap: on
line diff