diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2013-01-01 09:11:05 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2013-01-01 09:11:05 +0000 |
| commit | ab422c4d6899b1442cb6954c1829c1fb656b006c (patch) | |
| tree | 60db097dfe36449f23ebab332ba625f15c7f7bb1 /lisp/vc/ediff-merg.el | |
| parent | 5cebef2d18da5c7b365875bd2f771a8953284ec5 (diff) | |
| download | emacs-ab422c4d6899b1442cb6954c1829c1fb656b006c.tar.gz | |
Update copyright notices for 2013.
Diffstat (limited to 'lisp/vc/ediff-merg.el')
| -rw-r--r-- | lisp/vc/ediff-merg.el | 2 |
1 files changed, 1 insertions, 1 deletions
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 |