On Tue, Jun 01, 2004 at 08:52:38PM +1200, Alasdair Tennant wrote:
> Your problem is an old one that I have yet to see a solution for.  The
> prospect of the same file revised at both ends is the Nemesis.  

well, unison does have merge support.
haven't tested it yet though.

greetings, martin.
-- 
looking for a job doing pike programming, sTeam/caudium/pike/roxen training,
sTeam/caudium/roxen and/or unix system administration anywhere in the world.
--
pike programmer   travelling and working in europe            open-steam.org
unix system-      bahai.or.at                       iaeste.(tuwien.ac|or).at
administrator     (stuts|black.linux-m68k).org                  is.schon.org
Martin B�hr       http://www.iaeste.or.at/~mbaehr/

Reply via email to