From mboxrd@z Thu Jan 1 00:00:00 1970 From: Radoslaw Szkodzinski Subject: Re: No merge strategy handled the merge (git version 1.1.GIT) Date: Sun, 29 Jan 2006 13:32:42 +0100 Message-ID: <43DCB5EA.3030804@gorzow.mm.pl> References: <43DB4D16.6050807@drugphish.ch> <20060129120344.GB4815@c165.ib.student.liu.se> <43DCB3D8.8010902@gorzow.mm.pl> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig55E2FF24C9274BCF125F026A" Cc: Roberto Nibali , git@vger.kernel.org X-From: git-owner@vger.kernel.org Sun Jan 29 13:33:02 2006 Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by ciao.gmane.org with esmtp (Exim 4.43) id 1F3Bjh-0000rR-Cn for gcvg-git@gmane.org; Sun, 29 Jan 2006 13:32:53 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750949AbWA2Mcu (ORCPT ); Sun, 29 Jan 2006 07:32:50 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750946AbWA2Mcu (ORCPT ); Sun, 29 Jan 2006 07:32:50 -0500 Received: from goliat1.kalisz.mm.pl ([81.15.136.226]:41428 "EHLO kalisz.mm.pl") by vger.kernel.org with ESMTP id S1750949AbWA2Mcu (ORCPT ); Sun, 29 Jan 2006 07:32:50 -0500 Received: (qmail 7648 invoked from network); 29 Jan 2006 12:32:48 -0000 Received: from unknown (HELO zen.uplink) (astralstorm@[81.190.183.100]) (envelope-sender ) by 0 (qmail-ldap-1.03) with SMTP for ; 29 Jan 2006 12:32:48 -0000 Received: from [192.168.0.1] (zen.uplink [192.168.0.1]) by zen.uplink (Postfix) with ESMTP id E0FD3178460; Sun, 29 Jan 2006 13:32:42 +0100 (CET) User-Agent: Thunderbird 1.4.1 (X11/20051010) To: Fredrik Kuivinen In-Reply-To: <43DCB3D8.8010902@gorzow.mm.pl> X-Enigmail-Version: 0.93.0.0 Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig55E2FF24C9274BCF125F026A Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable 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. >=20 > Also in diffutils (the package with diff3). >=20 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 --=20 GPG Key id: 0xD1F10BA2 Fingerprint: 96E2 304A B9C4 949A 10A0 9105 9543 0453 D1F1 0BA2 AstralStorm --------------enig55E2FF24C9274BCF125F026A Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFD3LXqlUMEU9HxC6IRAgOGAKCQ01Re9f2s3lDSFI/nI3QVZE2M9ACgkqLq DL8D428e0syEAhjb60lMPso= =bLaL -----END PGP SIGNATURE----- --------------enig55E2FF24C9274BCF125F026A--