diff options
Diffstat (limited to 'lisp/vc/ediff-merg.el')
| -rw-r--r-- | lisp/vc/ediff-merg.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/vc/ediff-merg.el b/lisp/vc/ediff-merg.el index a1f4d4f5d78..a319d8de9b6 100644 --- a/lisp/vc/ediff-merg.el +++ b/lisp/vc/ediff-merg.el @@ -92,6 +92,8 @@ Buffer B." ) (make-variable-buffer-local 'ediff-skip-merge-regions-that-differ-from-default) +(defvar state-of-merge) ; dynamic var + ;; check if there is no clash between the ancestor and one of the variants. ;; if it is not a merge job then return true (defun ediff-merge-region-is-non-clash (n) @@ -351,8 +353,6 @@ Combining is done according to the specifications in variable (reverse delim-regs-list) ))) -(defvar state-of-merge) ; dynamic var - ;; Check if the non-preferred merge has been modified since originally set. ;; This affects only the regions that are marked as default-A/B or combined. ;; If PREFERS-TOO is non-nil, then look at the regions marked as prefers-A/B as |