diff lisp/ediff-merg.el @ 80793:7aad137aaf4e

Copy in some minor bug fixes from the trunk.
author Alan Mackenzie <acm@muc.de>
date Wed, 03 Sep 2008 21:01:12 +0000
parents 73661ddc7ac7
children 107ccd98fa12
line wrap: on
line diff