From 19a60d85d175655604db279a946dde3b1827e8b8 Mon Sep 17 00:00:00 2001
From: Gerard Vermeulen <gerard.vermeulen@neel.cnrs.fr>
Date: Mon, 28 Mar 2022 09:47:05 +0200
Subject: [PATCH] Start a version control section configuring ediff

---
 README.org | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/README.org b/README.org
index ae4d51a..02c3f9a 100644
--- a/README.org
+++ b/README.org
@@ -1036,6 +1036,39 @@ to {{{kbd(M-s d)}}} and =deadgrep-edit-mode= to {{{kbd(C-c C-w)}}}.
     (define-key deadgrep-mode-map (kbd "C-c C-w") #'deadgrep-edit-mode))
 #+end_src
 
+* [[info:emacs#Version Control][Version Control (info)]]
+:PROPERTIES:
+:CUSTOM_ID: sec:version-control
+:END:
+
+** [[info:ediff#Top][Ediff (info)]]
+:PROPERTIES:
+:CUSTOM_ID: sec:ediff
+:END:
+
+Video links to complete the [[info:ediff#Top][ediff (info)]] manual are:
+1. [[https://www.youtube.com/watch?v=6ZWp05OW1c0][Emergency Emacs]].
+2. [[https://protesilaos.com/codelog/2020-04-10-emacs-smerge-ediff/][Use =smerge= and =ediff= to resolve file conflicts]].
+Listing [[lst:configure-ediff]] configures =ediff= to display all its buffers in a
+single frame and to make all text visible prior to ediffing Org buffers.
+
+#+caption[Configure =ediff=]:
+#+caption: Configure =ediff=.
+#+name: lst:configure-ediff
+#+begin_src emacs-lisp
+  (with-eval-after-load 'emacs
+    (custom-set-variables
+     '(ediff-merge-split-window-function #'split-window-horizontally)
+     '(ediff-split-window-function #'split-window-horizontally)
+     '(ediff-window-setup-function #'ediff-setup-windows-plain)))
+  (with-eval-after-load 'org
+    ;; https://github.com/oantolin/emacs-config#readme
+    (defun ediff-with-org-show-all ()
+      "Expand all headings prior to ediffing org buffers."
+      (add-hook 'ediff-prepare-buffer-hook #'org-show-all nil t))
+    (add-hook 'org-mode-hook #'ediff-with-org-show-all))
+#+end_src
+
 * Reading
 :PROPERTIES:
 :CUSTOM_ID: sec:reading