about summary refs log tree commit diff
path: root/xdiff
diff options
context:
space:
mode:
authorChristian Neukirchen <chneukirchen@gmail.com>2014-07-30 15:54:20 +0200
committerChristian Neukirchen <chneukirchen@gmail.com>2014-07-30 15:54:20 +0200
commit8b1ac0bf2c0434749f5e7d87d9840c2030228174 (patch)
treeceb4842a64185cb6e0652a21131cf6a477fe61d9 /xdiff
downloadxtools-8b1ac0bf2c0434749f5e7d87d9840c2030228174.tar.gz
xtools-8b1ac0bf2c0434749f5e7d87d9840c2030228174.tar.xz
xtools-8b1ac0bf2c0434749f5e7d87d9840c2030228174.zip
initial import of xtools
Diffstat (limited to 'xdiff')
-rwxr-xr-xxdiff9
1 files changed, 9 insertions, 0 deletions
diff --git a/xdiff b/xdiff
new file mode 100755
index 0000000..e6c7cdb
--- /dev/null
+++ b/xdiff
@@ -0,0 +1,9 @@
+#!/bin/sh
+# xdiff [DIR] - merge XBPS .new-* files
+
+DIR=${1:-/etc}
+
+for newfile in $(find "$DIR" -name '*.new-*_*'); do
+	vimdiff "${newfile}" "${newfile%.new-*_*}" &&
+	rm -vi "${newfile}"
+done