Mercurial > emacs

comparison lisp/smerge-mode.el @ 79721:73661ddc7ac7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add 2008 to copyright years.
author Glenn Morris <rgm@gnu.org>
date Mon, 07 Jan 2008 02:45:14 +0000
parents 5b92bb6e6570
children 361a7f0f2540 107ccd98fa12
comparison
equal deleted inserted replaced
79720:9c0b3f269b92 79721:73661ddc7ac7
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, 3 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003,
4 ;; 2004, 2005, 2006, 2007 Free Software Foundation, Inc. 4 ;; 2004, 2005, 2006, 2007, 2008 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.