Mercurial > emacs

comparison lisp/emerge.el @ 14659:7669c19beda8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Comment change.
author Richard M. Stallman <rms@gnu.org>
date Sat, 24 Feb 1996 04:43:05 +0000
parents 454c8269c985
children a281f3b85f32
comparison
equal deleted inserted replaced
14658:c2ed969842dc 14659:7669c19beda8
1 ;;; emerge.el --- merge diffs under Emacs control 1 ;;; emerge.el --- merge diffs under Emacs control
2 2
3 ;;; The author has placed this file in the public domain. 3 ;;; The author has placed this file in the public domain.
4 4
5 ;; Author: Dale R. Worley <drw@math.mit.edu> 5 ;; Author: Dale R. Worley <worley@world.std.com>
6 ;; Version: 5fsf 6 ;; Version: 5fsf
7 ;; Keywords: unix, tools 7 ;; Keywords: unix, tools
8 8
9 ;; This software was created by Dale R. Worley and is 9 ;; This software was created by Dale R. Worley and is
10 ;; distributed free of charge. It is placed in the public domain and 10 ;; distributed free of charge. It is placed in the public domain and