Mercurial > emacs

comparison lisp/ediff-merg.el @ 87649:107ccd98fa12

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--rel--22 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-987
author Miles Bader <miles@gnu.org>
date Tue, 08 Jan 2008 20:46:54 +0000
parents d755c1fce9b3 73661ddc7ac7
children 606f2d163a64 6523ed37006c
comparison
equal deleted inserted replaced
87648:7ae99e295dfd 87649:107ccd98fa12
1 ;;; ediff-merg.el --- merging utilities 1 ;;; ediff-merg.el --- merging utilities
2 2
3 ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 3 ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4 ;; 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. 4 ;; 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
5 5
6 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> 6 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
7 7
8 ;; This file is part of GNU Emacs. 8 ;; This file is part of GNU Emacs.
9 9