diff lisp/ediff-merg.el @ 88104:d4d0381a59d8

Merge from emacs--rel--22 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1032
author Miles Bader <miles@gnu.org>
date Fri, 01 Feb 2008 02:40:23 +0000
parents 107ccd98fa12
children 606f2d163a64 6523ed37006c
line wrap: on
line diff