diff src/lisp.h @ 11044:796be3f4f8a1

(menu-bar-file-menu): Changed "Emerge" to "Merge" to agree with the new ediff package.
author Karl Heuer <kwzh@gnu.org>
date Thu, 16 Mar 1995 23:04:55 +0000
parents 31d88266ed12
children 6e80a9e29466
line wrap: on
line diff