summaryrefslogtreecommitdiff
path: root/lisp/emerge.el
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1992-07-29 05:48:40 +0000
committerRichard M. Stallman <rms@gnu.org>1992-07-29 05:48:40 +0000
commitee3b8d4df3b031a18355b820b1da0d27174bfe6d (patch)
tree5a30fba9c22170348009d10ab023b7f9ab98f2af /lisp/emerge.el
parentc9ed5a4721be187ad660901a41e738cd8ba575c4 (diff)
downloademacs-ee3b8d4df3b031a18355b820b1da0d27174bfe6d.tar.gz
entered into RCS
Diffstat (limited to 'lisp/emerge.el')
-rw-r--r--lisp/emerge.el1
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/emerge.el b/lisp/emerge.el
index f4faf572935..126b99c3aa2 100644
--- a/lisp/emerge.el
+++ b/lisp/emerge.el
@@ -1,4 +1,5 @@
;;; emerge.el --- merge diffs under Emacs control
+;;; The author has placed this file in the public domain.
;; Author: Dale R. Worley <drw@math.mit.edu>
;; Version: 4