Mercurial > emacs

diff lisp/smerge-mode.el @ 70292:2b77fa42947f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update my email address.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Sun, 30 Apr 2006 15:49:08 +0000
parents 3bd95f4f2941
children e3694f1cb928 d9f8d2a65d18 2ecafc6d5db7
line wrap: on
line diff
--- a/lisp/smerge-mode.el	Sun Apr 30 15:35:54 2006 +0000
+++ b/lisp/smerge-mode.el	Sun Apr 30 15:49:08 2006 +0000
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003,
 ;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
-;; Author: Stefan Monnier <monnier@cs.yale.edu>
+;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: tools revision-control merge diff3 cvs conflict
 
 ;; This file is part of GNU Emacs.