diff lisp/ediff-merg.el @ 99506:fa1e1238846b

Merge from gnus--devo--0 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1471
author Miles Bader <miles@gnu.org>
date Wed, 12 Nov 2008 08:12:19 +0000
parents eebbd7f32937
children d42aff5ca541
line wrap: on
line diff