[prev in list] [next in list] [prev in thread] [next in thread] 

List:       unison-users
Subject:    Re: [unison-users] Using merge with options NEW1 and NEW2 fails
From:       Benjamin Pierce <bcpierce () cis ! upenn ! edu>
Date:       2005-12-12 16:37:12
Message-ID: 9F7A7473-97B5-4A0E-B340-3E1B45653C45 () cis ! upenn ! edu
[Download RAW message or body]

Use CURRENT1 and CURRENT2 insted of NEW1 and NEW2.

Regards,

     - Benjamin

On Dec 12, 2005, at 11:22 AM, Markus Bühren wrote:

> Hi!
>
> I am using an external merge program with unison. When using a line
> like
>
> merge = Name * -> winmerge NEW1 NEW2
>
> and having changed file test.txt in different ways, winmerge is
> started
> with the files
>
> .unisonmergenew1-test.txt and
> .unisonmergenew2-test.txt
>
> as input arguments. Starting winmerge fails, as the generated
> temporary
> files are
>
> .unisonmerge1-test.txt and
> .unisonmerge2-test.txt
>
> When I change the file names in the winmerge open dialog everything
> works fine, even the commit of changes.
>
> I am using unison 2.17.1
>
> Regards
> Markus
>
>
>
>
>
>
>
> ------------------------ Yahoo! Groups Sponsor -------------------- 
> ~-->
> Most low income households are not online. Help bridge the digital  
> divide today!
> http://us.click.yahoo.com/I258zB/QnQLAA/TtwFAA/26EolB/TM
> -------------------------------------------------------------------- 
> ~->
>
>
> Yahoo! Groups Links
>
>
>
>
>



------------------------ Yahoo! Groups Sponsor --------------------~--> 
Fair play? Video games influencing politics. Click and talk back!
http://us.click.yahoo.com/2jUsvC/tzNLAA/TtwFAA/26EolB/TM
--------------------------------------------------------------------~-> 

 
Yahoo! Groups Links

<*> To visit your group on the web, go to:
    http://groups.yahoo.com/group/unison-users/

<*> To unsubscribe from this group, send an email to:
    unison-users-unsubscribe@yahoogroups.com

<*> Your use of Yahoo! Groups is subject to:
    http://docs.yahoo.com/info/terms/
 



[prev in list] [next in list] [prev in thread] [next in thread]