Re: RFE 698119: Add feature for external diff to allow three-way diff (and others)

Kirill,

In general I don't have the problem with adding 3-way diff even though 
I don't find it useful. It's probably easier to just have a conflict-
resolution tool when working with CVS because the merge is done by CVS 
 already. Also CVSNT allows to produce 3-way conflicts for update.

Anyhow, I am not sure it's good idea to mix normal and 3-way diff in 
the same combo-box. I will come back to you later once I think it 
over...

Best Regards,
Jerzy






 
Yahoo! Groups Links

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

<*> To unsubscribe from this group, send an email to:
    [email protected]

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