From ab422c4d6899b1442cb6954c1829c1fb656b006c Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 1 Jan 2013 09:11:05 +0000
Subject: Update copyright notices for 2013.

---
 lisp/vc/ediff-merg.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lisp/vc/ediff-merg.el')

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