diff lisp/ediff-merg.el @ 69636:51f98bc8ce67

* xdisp.c: Undo 2006-03-21 change.
author Kim F. Storm <storm@cua.dk>
date Wed, 22 Mar 2006 22:47:22 +0000
parents 6169b51037af
children 402a04b0362f d1c5430c5bff
line wrap: on
line diff