diff options
Diffstat (limited to 'lisp/ediff-merg.el')
| -rw-r--r-- | lisp/ediff-merg.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/ediff-merg.el b/lisp/ediff-merg.el index 92788ae968f..89e16791076 100644 --- a/lisp/ediff-merg.el +++ b/lisp/ediff-merg.el @@ -348,7 +348,8 @@ Combining is done according to the specifications in variable (reverse delim-regs-list) ))) - + +(eval-when-compile (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. |