Results 1 to 1 of 1
Hi All,
I updated my default as follows,
# Unison preferences file
root = /root/shibu/copy/file1.txt
root = ssh://hostname//root/shibu/copy/file1.txt
# Unison preferences file
merge = diff3 -m CURRENT1 OLD CURRENT2 > ...
Enjoy an ad free experience by logging in. Not a member yet? Register.
- 07-12-2011 #1Just Joined!
- Join Date
- Apr 2010
- Posts
- 16
File conflict merge with Unison
Hi All,
I updated my default as follows,
# Unison preferences file
root = /root/shibu/copy/file1.txt
root = ssh://hostname//root/shibu/copy/file1.txt
# Unison preferences file
merge = diff3 -m CURRENT1 OLD CURRENT2 > NEW
backuplocation = local
backupsuffix = .$VERSION
maxbackups = 5
But I'm getting the error Fatal error: File "default.prf", line 4: bad pattern: diff3 -m CURRENT1 OLD CURRENT2 > NEW
A pattern must be introduced by one of the following keywords:
Name, Path, or Regex.
Can any one help me to rectify this


Reply With Quote
