diff --git a/configs/init-packages.el b/configs/init-packages.el index 5626622..2110b17 100644 --- a/configs/init-packages.el +++ b/configs/init-packages.el @@ -97,6 +97,16 @@ doom-modeline-indent-info nil doom-modeline-persp-name t)) +;; Resolver diferencias entre 2 archivos o versiones del mismo. +(use-package ediff + :defer t + :ensure nil + :config + (setq ediff-diff-options "") + (setq ediff-custom-diff-options "-u") + (setq ediff-window-setup-function 'ediff-setup-windows-plain) + (setq ediff-split-window-function 'split-window-vertically)) + ;; Emparejamiento automático de comillas, paréntesis, corchetes y llaves (use-package electric-pair :defer t