From 63b15ce804073328467a8af67532a1a34bb2910c Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Sun, 10 Nov 2013 12:10:15 +0100
Subject: Initial commit

---
 pacmerge | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100755 pacmerge

diff --git a/pacmerge b/pacmerge
new file mode 100755
index 0000000..55654f1
--- /dev/null
+++ b/pacmerge
@@ -0,0 +1,16 @@
+#!/bin/zsh
+
+emacs --daemon=pacmerge
+
+for itm in $(find /etc/ -type f -name "*.pacnew"); do
+    local orig="${itm%.pacnew}"
+    if [[ -f "${orig}" ]]; then
+        emacsclient -s pacmerge -c -eval \
+            "(emerge-files nil \"${orig}\" \"${itm}\" \"${orig}\" nil \
+                           (lambda () (server-save-buffers-kill-terminal nil)))"
+    fi
+
+    rm $itm
+done
+
+emacsclient -s pacmerge -eval "(kill-emacs)"
-- 
cgit v1.2.3-54-g00ecf