Comments on: Interactive file merging with Unison

By: jojo

jojo — Wed, 28 Jul 2010 23:43:04 +0000

@Dave V
this seems better (only one line, nofork option has two dashes on my system):

merge = Regex .* -> gvimdiff –nofork CURRENT1 CURRENT2

By: Dave V

Dave V — Tue, 29 Sep 2009 00:08:51 +0000

gvimdiff works well for me. unison looks for changes to the temporary files CURRENT1 and CURRENT2 and applies them to the local and remote files respectively. Of course I should be able to get away with just one command, but this worked for my dot files:

merge = Path * -> gvimdiff –nofork CURRENT1 CURRENT2
merge = Path .* -> gvimdiff –nofork CURRENT1 CURRENT2

By: MC

MC — Tue, 01 Sep 2009 00:44:22 +0000

Minor update: After discovering that my netbook (running Ubuntu 8.10) does not yet have the KDiff libraries the following URL gives the most helpful instructions for getting it installed:

http://kapare.blogspot.com/2008/12/kdiff3-on-ubuntu-810.html