HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from emacs-24; up to 2012-05-07T21:26:08Z!rgm@gnu.org
[bpt/emacs.git]
/
lisp
/
vc
/
compare-w.el
diff --git
a/lisp/vc/compare-w.el
b/lisp/vc/compare-w.el
index
6e2ab73
..
14612c9
100644
(file)
--- a/
lisp/vc/compare-w.el
+++ b/
lisp/vc/compare-w.el
@@
-1,7
+1,7
@@
;;; compare-w.el --- compare text between windows for Emacs
;;; compare-w.el --- compare text between windows for Emacs
-;; Copyright (C) 1986, 1989, 1993, 1997, 2001
, 2002, 2003, 2004,
-;;
2005, 2006, 2007, 2008, 2009, 2010
Free Software Foundation, Inc.
+;; Copyright (C) 1986, 1989, 1993, 1997, 2001
-2012
+;; Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: convenience files vc
;; Maintainer: FSF
;; Keywords: convenience files vc
@@
-389,5
+389,4
@@
on third call it again advances points to the next difference and so on."
(provide 'compare-w)
(provide 'compare-w)
-;; arch-tag: 4177aab1-48e6-4a98-b7a1-000ee285de46
;;; compare-w.el ends here
;;; compare-w.el ends here