mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Merge from origin/emacs-25

Browse source 
2e2a806 Fix copyright years by hand
5badc81 Update copyright year to 2017
This commit is contained in:
Paul Eggert 2017-01-01 01:10:47 -08:00
commit bcf244ef9b
2494 changed files with 10381 additions and 2526 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lisp/vc/smerge-mode.el
View file

@ -1,6 +1,6 @@
;;; smerge-mode.el --- Minor mode to resolve diff3 conflicts -*- lexical-binding: t -*-
;; Copyright (C) 1999-2016 Free Software Foundation, Inc.
;; Copyright (C) 1999-2017 Free Software Foundation, Inc.
;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
;; Keywords: vc, tools, revision control, merge, diff3, cvs, conflict