diff options
| author | Dmitry Gutov <dgutov@yandex.ru> | 2015-04-14 05:03:32 +0300 |
|---|---|---|
| committer | Dmitry Gutov <dgutov@yandex.ru> | 2015-04-14 05:06:49 +0300 |
| commit | a9ccfaefc1ca8fa5b0177101984f64b3b186339b (patch) | |
| tree | 70c652aeeb0b392d25702a1d75c531f449ed347e /lisp/vc/diff.el | |
| parent | e192281baae377a8702f3c048fce988d63ccfc1a (diff) | |
| download | emacs-a9ccfaefc1ca8fa5b0177101984f64b3b186339b.tar.gz | |
Change diff-switches default to `-u'
Fixes: debbugs:20290
* doc/emacs/files.texi (Comparing Files): Document the new default
value of `diff-switches'.
* doc/emacs/trouble.texi (Sending Patches): Document the preference
for unified diff format. Escape the plus in the suggested `-F' regexp
value.
* lisp/vc/diff.el (diff-switches): Change the default to `-u'.
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 062248c8f14..2a973cfdfb1 100644 --- a/lisp/vc/diff.el +++ b/lisp/vc/diff.el @@ -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) |