diff options
| author | Paul Eggert | 2011-05-02 22:47:50 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-05-02 22:47:50 -0700 |
| commit | aceeea6c4510002d8fe99b2e6727532ba9cdd8ea (patch) | |
| tree | 2be9fe4b48ca3ba75c93160c03c22889d80b1cad /lisp/vc | |
| parent | 79f5556a7a75ed21c4fafa04f02adb81822a57f9 (diff) | |
| parent | 256661260dfed952d6497aef73607bfe24795614 (diff) | |
| download | emacs-aceeea6c4510002d8fe99b2e6727532ba9cdd8ea.tar.gz emacs-aceeea6c4510002d8fe99b2e6727532ba9cdd8ea.zip | |
Merge from mainline.
Diffstat (limited to 'lisp/vc')
| -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 4bc3466f13f..9655ce64a99 100644 --- a/lisp/vc/diff.el +++ b/lisp/vc/diff.el | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | ;;; diff.el --- run `diff' in compilation-mode | 1 | ;;; diff.el --- run `diff' |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1992, 1994, 1996, 2001-2011 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1992, 1994, 1996, 2001-2011 Free Software Foundation, Inc. |
| 4 | 4 | ||