diff options
| author | Ken Raeburn <raeburn@raeburn.org> | 2015-11-01 01:42:21 -0400 |
|---|---|---|
| committer | Ken Raeburn <raeburn@raeburn.org> | 2015-11-01 01:42:21 -0400 |
| commit | 39372e1a1032521be74575bb06f95a3898fbae30 (patch) | |
| tree | 754bd242a23d2358ea116126fcb0a629947bd9ec /lisp/vc/diff.el | |
| parent | 6a3121904d76e3b2f63007341d48c5c1af55de80 (diff) | |
| parent | e11aaee266da52937a3a031cb108fe13f68958c3 (diff) | |
| download | emacs-39372e1a1032521be74575bb06f95a3898fbae30.tar.gz | |
merge from trunk
Diffstat (limited to 'lisp/vc/diff.el')
| -rw-r--r-- | lisp/vc/diff.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/vc/diff.el b/lisp/vc/diff.el index 0fc0d2e3f73..2a973cfdfb1 100644 --- a/lisp/vc/diff.el +++ b/lisp/vc/diff.el @@ -1,11 +1,11 @@ ;;; diff.el --- run `diff' -*- lexical-binding: t -*- -;; Copyright (C) 1992, 1994, 1996, 2001-2013 Free Software Foundation, +;; Copyright (C) 1992, 1994, 1996, 2001-2015 Free Software Foundation, ;; Inc. ;; Author: Frank Bresz ;; (according to authors.el) -;; Maintainer: FSF +;; Maintainer: emacs-devel@gnu.org ;; Keywords: unix, vc, tools ;; This file is part of GNU Emacs. @@ -38,7 +38,7 @@ :group 'tools) ;;;###autoload -(defcustom diff-switches (purecopy "-c") +(defcustom diff-switches (purecopy "-u") "A string or list of strings specifying switches to be passed to diff." :type '(choice string (repeat string)) :group 'diff) |