summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/autoload.el
diff options
context:
space:
mode:
authorKarl Heuer <kwzh@gnu.org>1995-03-16 23:04:55 +0000
committerKarl Heuer <kwzh@gnu.org>1995-03-16 23:04:55 +0000
commit5438ecd32e4af020875e7068351f5225b72142d9 (patch)
tree801fac26c7dcb1ae9312bb69b64439700880e969 /lisp/emacs-lisp/autoload.el
parentca2a3cb73fbd4f372825c0ed256cdb01577eca80 (diff)
downloademacs-5438ecd32e4af020875e7068351f5225b72142d9.tar.gz
emacs-5438ecd32e4af020875e7068351f5225b72142d9.tar.bz2
emacs-5438ecd32e4af020875e7068351f5225b72142d9.zip
(menu-bar-file-menu): Changed "Emerge" to "Merge" to agree with the new ediff
package.
Diffstat (limited to 'lisp/emacs-lisp/autoload.el')
0 files changed, 0 insertions, 0 deletions