synctodo didn't preserve versions of the ultimately merged file; it does now
1 files changed, 5 insertions(+), 3 deletions(-) M synctodo
M synctodo +5 -3
@@ 87,11 87,13 @@ while read -r event ; do # because of the fswatch bug, we have to check this the hard way echo "$event" | grep -qP "^${ROOT}\.sync-conflict.*\.txt$" if [[ $? -eq 0 ]]; then - FILES=($(ls -tr ${ROOT}.sync-conflict*.txt) $FILE) - RES=$(merge $FILES) + CONFL=$(ls -tr ${ROOT}.sync-conflict*.txt) + RES=$(merge ($CONFL $FILE)) # cleanup set -e - mv $FILES "$backupdir/" + bkup=${FILE}-$(date %+s) + mv $FILE "$backupdir/$bkup" + mv $CONFL "$backupdir/" mv "$RES" "$FILE" set +e fi