diff options
| -rw-r--r-- | lisp/vc/ediff-merg.el | 2 |
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 default (`default-A', `default-B', `combined') and it hasn't been marked as `prefer-A' or `prefer-B'. 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 B." :type 'boolean |