Mercurial > emacs

comparison lisp/emerge.el @ 896:7e4999005da1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
entered into RCS
author Richard M. Stallman <rms@gnu.org>
date Wed, 29 Jul 1992 05:48:40 +0000
parents 0b4f3a91f207
children 14a2a89cb634
comparison
equal deleted inserted replaced
895:81e6b85a9261 896:7e4999005da1
1 ;;; emerge.el --- merge diffs under Emacs control 1 ;;; emerge.el --- merge diffs under Emacs control
2 ;;; The author has placed this file in the public domain.
2 3
3 ;; Author: Dale R. Worley <drw@math.mit.edu> 4 ;; Author: Dale R. Worley <drw@math.mit.edu>
4 ;; Version: 4 5 ;; Version: 4
5 ;; Keywords: unix, tools 6 ;; Keywords: unix, tools
6 7