diff options
Diffstat (limited to 'xdiff')
| -rwxr-xr-x | xdiff | 9 |
1 files changed, 8 insertions, 1 deletions
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 |