This commit is contained in:
Paul Eggert 2017-11-25 22:45:41 -08:00
parent 8be3aee281
commit a89f0b6f33
110 changed files with 715 additions and 716 deletions

View file

@ -1094,7 +1094,7 @@ used to replace chars to try and eliminate some spurious differences."
;; also and more importantly because otherwise it
;; may happen that diff doesn't behave like
;; smerge-refine-weight-hack expects it to.
;; See https://lists.gnu.org/archive/html/emacs-devel/2007-11/msg00401.html
;; See https://lists.gnu.org/r/emacs-devel/2007-11/msg00401.html
"-awd" "-ad")
file1 file2))
;; Process diff's output.