Unison merge with emacs

.config/bin/unison-merge-files

@@ -0,0 +1,11 @@
+#!/bin/sh
+CURRENT1=$1
+CURRENT2=$2
+NEW=$3
+CURRENTARCHOPT=$4
+EMACS="emacsclient -nc"
+if [ x$CURRENTARCHOPT = x ]; then
+	  $EMACS --eval "(emerge-files nil \"$CURRENT1\" \"$CURRENT2\" \"$NEW\")"
+else
+	  $EMACS --eval "(emerge-files-with-ancestor nil \"$CURRENT1\" \"$CURRENT2\" \"$CURRENTARCHOPT\" \"$NEW\")"
+fi

.unison/Projects.prf

@@ -3,7 +3,11 @@ label = Project list file and global notes
 root = /home/maxx/Projects
 root = ssh://home/Projects
 sshargs = -C
+
 path = notes.org
 path = notes.org_archive
 path = projects.org
-repeat = watch
+
+repeat = watch
+
+merge = Name {*,.*} -> unison-merge-files CURRENT1 CURRENT2 NEW CURRENTARCHOPT