Mercurial > emacs

diff lisp/vc/ediff-merg.el @ 110018:aa172fa85851

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge trunk
author Kenichi Handa <handa@m17n.org>
date Mon, 30 Aug 2010 09:15:54 +0900
parents 280c8ae2476d
children 1b626601d32d 417b1e4d63cd
line wrap: on
line diff
--- a/lisp/vc/ediff-merg.el	Thu Aug 26 09:47:34 2010 +0900
+++ b/lisp/vc/ediff-merg.el	Mon Aug 30 09:15:54 2010 +0900
@@ -4,6 +4,7 @@
 ;;   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
+;; Package: ediff
 
 ;; This file is part of GNU Emacs.