xdiff


1
2
3
4
5
6
7
8
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