From 06695a02fd9afde4f39916d8bc359cf5eac8c053 Mon Sep 17 00:00:00 2001 From: Tino Calancha Date: Sat, 21 Jan 2017 00:31:40 +0900 Subject: [PATCH] ; 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. --- lisp/vc/ediff-merg.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- 2.39.5