Mercurial > emacs

comparison lisp/smerge-mode.el @ 112218:376148b31b5e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add 2011 to FSF/AIST copyright years.
author Glenn Morris <rgm@gnu.org>
date Sun, 02 Jan 2011 15:50:46 -0800
parents 1d1d5d9bd884
children
comparison
equal deleted inserted replaced
112097:3ef3ed396505 112218:376148b31b5e
1 ;;; smerge-mode.el --- Minor mode to resolve diff3 conflicts 1 ;;; smerge-mode.el --- Minor mode to resolve diff3 conflicts
2 2
3 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 3 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
4 ;; 2007, 2008, 2009, 2010 Free Software Foundation, Inc. 4 ;; 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
5 5
6 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> 6 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
7 ;; Keywords: tools revision-control merge diff3 cvs conflict 7 ;; Keywords: tools revision-control merge diff3 cvs conflict
8 8
9 ;; This file is part of GNU Emacs. 9 ;; This file is part of GNU Emacs.