procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

; Fix a typo in ediff-merg.el

Browse source 
* lisp/vc/ediff-merg.el (ediff-skip-merge-regions-that-differ-from-default):
Fix a typo in docstring.
This commit is contained in:
Tino Calancha 2017-01-21 00:31:40 +09:00
parent 954e9e983b
commit 06695a02fd
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lisp/vc/ediff-merg.el
View file

@ -84,7 +84,7 @@ A region is considered to have been changed if it is different from the current
default (`default-A', `default-B', `combined') and it hasn't been marked as default (`default-A', `default-B', `combined') and it hasn't been marked as
`prefer-A' or `prefer-B'. `prefer-A' or `prefer-B'.
A region is considered to have been changed also when it is marked as A region is considered to have been changed also when it is marked as
as `prefer-A', but is different from the corresponding difference region in `prefer-A', but is different from the corresponding difference region in
Buffer A or if it is marked as `prefer-B' and is different from the region in Buffer A or if it is marked as `prefer-B' and is different from the region in
Buffer B." Buffer B."
:type 'boolean :type 'boolean