aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTino Calancha2017-01-21 00:31:40 +0900
committerTino Calancha2017-01-21 00:31:40 +0900
commit06695a02fd9afde4f39916d8bc359cf5eac8c053 (patch)
tree63e53567f76b60a1a67601e60749772f95ee7a95
parent954e9e983b7e446ebf4a7b4dfee0dca82b6b57f7 (diff)
downloademacs-06695a02fd9afde4f39916d8bc359cf5eac8c053.tar.gz
emacs-06695a02fd9afde4f39916d8bc359cf5eac8c053.zip
; Fix a typo in ediff-merg.el
* lisp/vc/ediff-merg.el (ediff-skip-merge-regions-that-differ-from-default): Fix a typo in docstring.
-rw-r--r--lisp/vc/ediff-merg.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/vc/ediff-merg.el b/lisp/vc/ediff-merg.el
index 2567818de65..d7fa74fff87 100644
--- a/lisp/vc/ediff-merg.el
+++ b/lisp/vc/ediff-merg.el
@@ -84,7 +84,7 @@ A region is considered to have been changed if it is different from the current
84default (`default-A', `default-B', `combined') and it hasn't been marked as 84default (`default-A', `default-B', `combined') and it hasn't been marked as
85`prefer-A' or `prefer-B'. 85`prefer-A' or `prefer-B'.
86A region is considered to have been changed also when it is marked as 86A region is considered to have been changed also when it is marked as
87as `prefer-A', but is different from the corresponding difference region in 87`prefer-A', but is different from the corresponding difference region in
88Buffer A or if it is marked as `prefer-B' and is different from the region in 88Buffer A or if it is marked as `prefer-B' and is different from the region in
89Buffer B." 89Buffer B."
90 :type 'boolean 90 :type 'boolean