diff options
| author | jave | 2015-01-02 16:30:55 +0100 |
|---|---|---|
| committer | jave | 2015-01-02 16:30:55 +0100 |
| commit | db4613576d3115aa320f0293d081ce98baa06acd (patch) | |
| tree | 829968643b451bd3f64c791e4d3a6c928010e14c /lisp/vc/diff.el | |
| parent | c089503bac34376e75ae6f1d2c289fc8c9f42b8f (diff) | |
| parent | d0ca1148fe2d1e72e86f0197731071f139c143e3 (diff) | |
| download | emacs-db4613576d3115aa320f0293d081ce98baa06acd.tar.gz emacs-db4613576d3115aa320f0293d081ce98baa06acd.zip | |
merge master
Diffstat (limited to 'lisp/vc/diff.el')
| -rw-r--r-- | lisp/vc/diff.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/vc/diff.el b/lisp/vc/diff.el index b789b80df8e..062248c8f14 100644 --- a/lisp/vc/diff.el +++ b/lisp/vc/diff.el | |||
| @@ -1,6 +1,6 @@ | |||
| 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-2014 Free Software Foundation, | 3 | ;; Copyright (C) 1992, 1994, 1996, 2001-2015 Free Software Foundation, |
| 4 | ;; Inc. | 4 | ;; Inc. |
| 5 | 5 | ||
| 6 | ;; Author: Frank Bresz | 6 | ;; Author: Frank Bresz |