monotone-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Monotone-devel] Re: How to 3-way merge with kdiff3 and Cygwin?


From: Nathaniel Smith
Subject: Re: [Monotone-devel] Re: How to 3-way merge with kdiff3 and Cygwin?
Date: Wed, 21 Feb 2007 21:12:18 -0800
User-agent: Mutt/1.5.13 (2006-08-11)

On Wed, Feb 21, 2007 at 11:50:08AM -0800, Graydon Hoare wrote:
> Boris wrote:
> 
> >How do others merge on Cygwin?
> 
> I use the following entries in my monotonerc file. Something like this 
> should probably be fixed up in mainline; we're not very useful on cygwin.

So that works to let cygwin mtn call into native merge tools.  What if
cygwin mtn is trying to call into a cygwin merge tool, will this still
work?  If so, then we should totally be doing this in all cases; if
not, I'm not sure what we should be doing...

-- Nathaniel

-- 
"The problem...is that sets have a very limited range of
activities -- they can't carry pianos, for example, nor drink
beer."




reply via email to

[Prev in Thread] Current Thread [Next in Thread]