From 4eb69405683c90659e7f2a9c3a2fd947dd027ed0 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sat, 17 Aug 2013 15:21:01 +0100
Subject: Emacs: Provide ap-functions in ap-functions.el

---
 emacs/elisp/ap-functions.el | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/emacs/elisp/ap-functions.el b/emacs/elisp/ap-functions.el
index 104b4449..4c300015 100644
--- a/emacs/elisp/ap-functions.el
+++ b/emacs/elisp/ap-functions.el
@@ -44,3 +44,5 @@
                        ""))
         (command (read-shell-command "Shell command: " nil nil nil)))
     (shell-command (replace-regexp-in-string "%" file-buffer command) to-current-buffer)))
+
+(provide 'ap-functions)
-- 
cgit 1.4.1


From 7af9f474a725c084931594ca52c775ec060daf81 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sat, 17 Aug 2013 15:22:37 +0100
Subject: Setup ediff configuration

---
 emacs/init.el | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/emacs/init.el b/emacs/init.el
index 0f05bc0c..d142da47 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -427,6 +427,12 @@ Values: `desktop', `server', `laptop'")
             (add-to-list 'tramp-remote-path "/usr/local/sbin")
             (add-to-list 'tramp-remote-path "~/bin")))
 
+(use-package ediff
+  :defer t
+  :config (progn
+            (setq ediff-split-window-function 'split-window-horizontally
+                  ediff-window-setup-function 'ediff-setup-windows-plain)))
+
 ;;;; Indentation
 
 (setq-default tab-width 4
-- 
cgit 1.4.1


From 314c9708d77bf367b775bf71be374faa690bcb1f Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sat, 17 Aug 2013 15:23:10 +0100
Subject: Git: use the patience diff algorithm

---
 gitconfig | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gitconfig b/gitconfig
index 74d13ecb..0e4d5afe 100644
--- a/gitconfig
+++ b/gitconfig
@@ -18,4 +18,6 @@
 	standup = log --pretty=format:'%Cred%h%Creset -%Creset %s %Cgreen(%ci) %C(bold blue)<%an>%Creset' --since yesterday --author alan
 	ignored = ls-files --others -i --exclude-standard
 [github]
-	user = alan@alanpearce.co.uk
\ No newline at end of file
+	user = alan@alanpearce.co.uk
+[diff]
+	algorithm = patience
-- 
cgit 1.4.1