From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
Date: Sun, 29 Jan 2006 12:32:42 GMT
Subject: Re: No merge strategy handled the merge (git version 1.1.GIT)
Message-ID: <43DCB5EA.3030804@gorzow.mm.pl>
In-Reply-To: <43DCB3D8.8010902@gorzow.mm.pl>

Radoslaw Szkodzinski wrote:
>> The problem is that merge(1), which is used for file-level merges,
>> couldn't be found. Is it installed on your system? If you use Linux,
>> it is usually found in the "rcs" package in your favorite
>> distribution.
> 
> Also in diffutils (the package with diff3).
> 

No, I was wrong. However, diff3 can merge files and should also be
supported. It is much lighter than full rcs.

Parameters:
diff3 -m local base new > mergedlocal

-- 
GPG Key id:  0xD1F10BA2
Fingerprint: 96E2 304A B9C4 949A 10A0  9105 9543 0453 D1F1 0BA2

AstralStorm