dired and vc

1 files changed, 19 insertions, 1 deletions

diff --git a/emacs/.emacs.d/init/ycp-vc.el b/emacs/.emacs.d/init/ycp-vc.el
index 251714d..7496cef 100644
--- a/emacs/.emacs.d/init/ycp-vc.el
+++ b/emacs/.emacs.d/init/ycp-vc.el
@@ -47,11 +47,29 @@
 
 (my-package ediff
   (:delay 30)
-;;;; `ediff'
+  (my-keybind global-map
+    "C-c = b" #'ediff-buffers
+    "C-c = B" #'ediff-buffers3
+    "C-c = c" #'compare-windows
+    "C-c = =" #'ediff-files
+    "C-c = f" #'ediff-files
+    "C-c = F" #'ediff-files3
+    "C-c = m" #'count-matches
+    "C-c = r" #'ediff-revision
+    "C-c = p" #'ediff-patch-file
+    "C-c = P" #'ediff-patch-buffer
+    "C-c = l" #'ediff-regions-linewise
+    "C-c = w" #'ediff-regions-wordwise)
   (setq ediff-keep-variants nil)
   (setq ediff-make-buffers-readonly-at-startup nil)
   (setq ediff-show-clashes-only t)
   (setq ediff-split-window-function 'split-window-horizontally)
+  (setq ediff-combination-pattern
+        '("<<<<<<< A: HEAD" A
+          "||||||| Ancestor" Ancestor
+          "======="
+          B ">>>>>>> B: Incoming"))
+  (setq ediff-diff-options "-w")
   )
 
 (my-package vc-git