27 lines
855 B
Bash
Executable File
27 lines
855 B
Bash
Executable File
#!/bin/sh
|
|
stats() {
|
|
stat --format '%.10y %n %sB - birth %.10w' "$@"
|
|
}
|
|
test "$1" = "-q" && quick=-q && shift
|
|
if test "$#" -gt 0
|
|
then
|
|
orig="$(st-unarchive "$1")"
|
|
if test -n "$quick"
|
|
then stats "$orig" "$1"
|
|
else
|
|
( stats "$orig" "$1"; dif "$orig" "$@" ) |
|
|
less --RAW-CONTROL-CHARS --quit-on-intr --quit-if-one-screen
|
|
test "$?" -eq "2" && exit 1
|
|
echo "y|r to restore, n|d to delete, m to merge"
|
|
read reply
|
|
case "$reply" in
|
|
(y|r) st-restore "$1";;
|
|
(n|d) rm -v "$1";;
|
|
(m) touch /tmp/empty && git merge-file "$orig" /tmp/empty "$1" && nvim "$orig" && rm "$1";;
|
|
esac
|
|
fi
|
|
else
|
|
find "$DATA/2-standards/notes/journal" -name "intentions.sync-conflict*" -exec jrnl intentions --import --file {} \; -delete
|
|
find -name '*sync-conflict*' -exec st-diff $quick '{}' \;
|
|
fi
|