From cbf5cc8f2a80c95c67766f7a0884744283e54fd9 Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Tue, 26 May 2015 14:01:19 +0200 Subject: xdiff: just list the new files using -l. --- xdiff | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'xdiff') diff --git a/xdiff b/xdiff index 406e24f..bb72fb9 100755 --- a/xdiff +++ b/xdiff @@ -1,13 +1,20 @@ #!/bin/sh -# xdiff [-u] [DIR] - merge XBPS .new-* files +# xdiff [-u|-l] [DIR] - merge XBPS .new-* files mergeutil() { vimdiff "$1" "$2" && rm -vi "$1" } +listutil() { + printf '%s\n' "$1" +} + if [ "$1" = -u ]; then shift DIFF="diff -u" +elif [ "$1" = -l ]; then + shift + DIFF=listutil else DIFF=mergeutil fi -- cgit 1.4.1