I'm trying to keep two gaim configurations in sync with unison-gtk 2.13.16-5, and am getting non-zero exit codes with the following:
# gaim.prf root = /home/nospam/.gaim root = ssh://remote//home/nospam/.gaim merge = Name * -> diff3 -m CURRENT1 OLD CURRENT2 > NEW backup = Name * maxbackups = 10 prefer = newer So, when trying to merge prefs.xml, for example, I get log output like this: UNISON started propagating changes at 12:01:28 on 07 Apr 2007 [CONFLICT] Skipping foo.xml diff3 -m /home/nospam/.gaim/.#unisonmerge1-prefs.xml OLD /home/nospam/.gaim/.#unisonmerge2-prefs.xml > /home/nospam/.gaim/.#unisonmergenew1-prefs.xml UNISON finished propagating changes at 12:01:28 on 07 Apr 2007 What am I doing wrong here? -- "Oh, look: rocks!" -- Doctor Who, "Destiny of the Daleks" -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]