From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
To: Fredrik Kuivinen <freku045@student.liu.se>
Cc: Roberto Nibali <ratz@drugphish.ch>, git@vger.kernel.org
Subject: Re: No merge strategy handled the merge (git version 1.1.GIT)
Date: Sun, 29 Jan 2006 13:23:52 +0100 [thread overview]
Message-ID: <43DCB3D8.8010902@gorzow.mm.pl> (raw)
In-Reply-To: <20060129120344.GB4815@c165.ib.student.liu.se>
[-- Attachment #1: Type: text/plain, Size: 381 bytes --]
> 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 252 bytes --]
next prev parent reply other threads:[~2006-01-29 12:24 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-01-28 10:53 No merge strategy handled the merge (git version 1.1.GIT) Roberto Nibali
2006-01-29 12:03 ` Fredrik Kuivinen
2006-01-29 12:16 ` [PATCH] merge-recursive: Improve the error message printed when merge(1) isn't found Fredrik Kuivinen
2006-01-29 23:42 ` Roberto Nibali
2006-01-29 12:23 ` Radoslaw Szkodzinski [this message]
2006-01-29 12:32 ` No merge strategy handled the merge (git version 1.1.GIT) Radoslaw Szkodzinski
2006-01-29 23:42 ` Roberto Nibali
2006-01-29 23:50 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=43DCB3D8.8010902@gorzow.mm.pl \
--to=astralstorm@gorzow.mm.pl \
--cc=freku045@student.liu.se \
--cc=git@vger.kernel.org \
--cc=ratz@drugphish.ch \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).