logo       
Google Custom Search
    AddThis Social Bookmark Button
-->

Re: using hg to do merges for different SCM: msg#00237

Subject: Re: using hg to do merges for different SCM
On Fri, 2006-01-27 at 11:23 -0800, malahal@xxxxxxxxxx wrote:
> Hi, we use a different SCM at work that doesn't have 'merge' feature.
> It requires manual merge for non-conflicting files! I am planning on
> using mercurial to do merges for me. Does the following approach work?
> Is there any better way of doing the same?

This doesn't make any obvious sense.  Why not write some scripts that
run something like kdiff3 instead?  It will be much less cumbersome.

        <b



<Prev in Thread] Current Thread [Next in Thread>