Add 2012 to FSF copyright years for Emacs files

[gnu-emacs] / lisp / vc / ediff-merg.el

diff --git a/lisp/vc/ediff-merg.el b/lisp/vc/ediff-merg.el
index a584d0791ff6843b89a5cd1d44399469d20c9ff2..9b817b2fbc1536503c9b77ce3d70ce4d9447e0e3 100644 (file)
--- a/lisp/vc/ediff-merg.el
+++ b/lisp/vc/ediff-merg.el
@@ -1,6 +1,6 @@
 ;;; ediff-merg.el --- merging utilities
 
-;; Copyright (C) 1994-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1994-2012 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Package: ediff