diff options
| author | Paul Eggert | 2013-01-02 08:13:04 -0800 |
|---|---|---|
| committer | Paul Eggert | 2013-01-02 08:13:04 -0800 |
| commit | 0877d0dc24ee792b9b14592869ea1aa0934aee58 (patch) | |
| tree | 08e9265a1dd95974dc72622a9bef194682c0c716 /lisp/vc/diff.el | |
| parent | aca3d51dfa45794fa68a2ffb6269e34fcee2ec6c (diff) | |
| parent | d8fb8cce84b923a3289b69549e30958710ac3ebb (diff) | |
| download | emacs-0877d0dc24ee792b9b14592869ea1aa0934aee58.tar.gz emacs-0877d0dc24ee792b9b14592869ea1aa0934aee58.zip | |
Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca
Diffstat (limited to 'lisp/vc/diff.el')
| -rw-r--r-- | lisp/vc/diff.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/vc/diff.el b/lisp/vc/diff.el index b1c334ddcfc..d0e496d2d21 100644 --- a/lisp/vc/diff.el +++ b/lisp/vc/diff.el | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | ;;; diff.el --- run `diff' -*- lexical-binding: t -*- | 1 | ;;; diff.el --- run `diff' -*- lexical-binding: t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1992, 1994, 1996, 2001-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1992, 1994, 1996, 2001-2013 Free Software Foundation, |
| 4 | ;; Inc. | ||
| 4 | 5 | ||
| 5 | ;; Author: Frank Bresz | 6 | ;; Author: Frank Bresz |
| 6 | ;; (according to authors.el) | 7 | ;; (according to authors.el) |