From 86e67f12674b7e6f679770ce04a33de914ee964e Mon Sep 17 00:00:00 2001
From: Gergely Polonkai <gergely@polonkai.eu>
Date: Mon, 19 Nov 2018 09:47:43 +0100
Subject: [PATCH] Configure the pacfiles package

It helps a lot during big Arch upgrades.
---
 configuration.org | 7 +++++++
 customizations.el | 1 +
 2 files changed, 8 insertions(+)

diff --git a/configuration.org b/configuration.org
index 44a0575..49cc2f7 100644
--- a/configuration.org
+++ b/configuration.org
@@ -2160,6 +2160,13 @@ Then configure ~real-auto-save-mode~
   (text-mode . gpolonkai/dont-autosave-remote))
 #+END_SRC
 
+** Help merging ~pacsave~ and ~pacnew~ files
+
+#+BEGIN_SRC emacs-lisp
+(use-package pacfiles-mode
+  :commands pacfiles)
+#+END_SRC
+
 * Make programming a bit easier
 
 ** Electric case
diff --git a/customizations.el b/customizations.el
index 96de5da..894d64c 100644
--- a/customizations.el
+++ b/customizations.el
@@ -148,6 +148,7 @@
      org-ref
      org-rtm
      origami
+     pacfiles-mode
      package-build
      page-break-lines
      phi-search