From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <ldv@altlinux.org>
Date: Tue, 10 Oct 2006 23:18:14 +0400
From: "Dmitry V. Levin" <ldv@altlinux.org>
To: ALT Devel discussion list <devel@lists.altlinux.org>
Message-ID: <20061010191814.GA21988@basalt.office.altlinux.org>
Mail-Followup-To: ALT Devel discussion list <devel@lists.altlinux.org>
References: <20061010190906.GL8008@localhost.localdomain>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="h31gzZEtNLTqOjlF"
Content-Disposition: inline
In-Reply-To: <20061010190906.GL8008@localhost.localdomain>
X-fingerprint: FE4C 93AB E19A 2E4C CB5D  3E4E 7CAB E6AC 9E35 361E
Subject: Re: [devel] git-merge-recursive fails on symlinks
X-BeenThere: devel@lists.altlinux.org
X-Mailman-Version: 2.1.9rc1
Precedence: list
Reply-To: ALT Devel discussion list <devel@lists.altlinux.org>
List-Id: ALT Devel discussion list <devel.lists.altlinux.org>
List-Unsubscribe: <https://lists.altlinux.org/mailman/listinfo/devel>,
	<mailto:devel-request@lists.altlinux.org?subject=unsubscribe>
List-Archive: <http://lists.altlinux.org/pipermail/devel>
List-Post: <mailto:devel@lists.altlinux.org>
List-Help: <mailto:devel-request@lists.altlinux.org?subject=help>
List-Subscribe: <https://lists.altlinux.org/mailman/listinfo/devel>,
	<mailto:devel-request@lists.altlinux.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Oct 2006 19:18:14 -0000
Archived-At: <http://lore.altlinux.org/devel/20061010191814.GA21988@basalt.office.altlinux.org/>
List-Archive: <http://lore.altlinux.org/devel/>
List-Post: <mailto:devel@altlinux.org>


--h31gzZEtNLTqOjlF
Content-Type: text/plain; charset=koi8-r
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Tue, Oct 10, 2006 at 11:09:06PM +0400, Alexey Tourbin wrote:
> /usr/bin/git-merge-recursive:

=FC=D4=CF=D4 =CB=CF=C4 =CE=C1 python =D7 =D3=CC=C5=C4=D5=C0=DD=C5=CA =D7=C5=
=D2=D3=C9=C9 git (=CB=CF=D4=CF=D2=C1=D1 =D3=CF=C2=C9=D2=C1=C5=D4=D3=D1 =D3=
=CB=CF=D2=CF =D7=D9=CA=D4=C9)
=CF=C2=DF=D1=D7=CC=C5=CE deprecated =C9 =DA=C1=CD=C5=CE=A3=CE =C4=D2=D5=C7=
=C9=CD =CB=CF=C4=CF=CD =CE=C1 C.


--=20
ldv

--h31gzZEtNLTqOjlF
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (GNU/Linux)

iD8DBQFFK/H2fKvmrJ41Nh4RAgp1AJ48IlSIXUBQ6gDhAZjwMdEYm5iGIgCfW6lV
TdZUxUoTMlk7d43eBurOfdA=
=x+7q
-----END PGP SIGNATURE-----

--h31gzZEtNLTqOjlF--