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
commit08b76cb4e78c7ce4e4d60d3d6c31e50fefc7c70c (patch)
tree0c0c6eb7e74384c15cbc01e4d880d7141e85cef0 /lisp/emerge.el
parent33909072abb4646a332ddb987822eca5f5c2dab0 (diff)
downloademacs-08b76cb4e78c7ce4e4d60d3d6c31e50fefc7c70c.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