summaryrefslogtreecommitdiff
path: root/lisp/vc/ediff-merg.el
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2010-08-29 12:17:13 -0400
committerChong Yidong <cyd@stupidchicken.com>2010-08-29 12:17:13 -0400
commitbd78fa1d5442e6e023a16d407741ec899d57d3cd (patch)
treefe959a18baff827f362b8b43b56b0cb644983272 /lisp/vc/ediff-merg.el
parent4520b858c1d64bf61db1ae7b00b1b84e0cc645bd (diff)
downloademacs-bd78fa1d5442e6e023a16d407741ec899d57d3cd.tar.gz
emacs-bd78fa1d5442e6e023a16d407741ec899d57d3cd.tar.bz2
emacs-bd78fa1d5442e6e023a16d407741ec899d57d3cd.zip
Add "Package:" file headers to denote built-in packages.
Diffstat (limited to 'lisp/vc/ediff-merg.el')
-rw-r--r--lisp/vc/ediff-merg.el1
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/vc/ediff-merg.el b/lisp/vc/ediff-merg.el
index c4b94a02e0c..4c6aee15d1d 100644
--- a/lisp/vc/ediff-merg.el
+++ b/lisp/vc/ediff-merg.el
@@ -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.