Re: No merge strategy handled the merge (git version 1.1.GIT)

From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
Date: 2006-01-29 23:23:52
> 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).

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

AstralStorm


-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Received on Sun Jan 29 23:24:44 2006

This archive was generated by hypermail 2.1.8 : 2006-01-29 23:24:53 EST