From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?B?UmVuw6kgU2NoYXJmZQ==?= Subject: Re: 'Theirs' merge between branches on a binary file. Date: Tue, 23 Dec 2008 19:31:54 +0100 Message-ID: <49512E9A.5040902@lsrfire.ath.cx> References: <7vr63zhq4k.fsf@gitster.siamese.dyndns.org> <7vd4fjhlf8.fsf@gitster.siamese.dyndns.org> <7v3agfhk8b.fsf@gitster.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Junio C Hamano , git@vger.kernel.org To: Tim Visher X-From: git-owner@vger.kernel.org Tue Dec 23 19:33:30 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1LFC4J-0004fL-R1 for gcvg-git-2@gmane.org; Tue, 23 Dec 2008 19:33:24 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751022AbYLWScB convert rfc822-to-quoted-printable (ORCPT ); Tue, 23 Dec 2008 13:32:01 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751016AbYLWScA (ORCPT ); Tue, 23 Dec 2008 13:32:00 -0500 Received: from india601.server4you.de ([85.25.151.105]:51803 "EHLO india601.server4you.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750916AbYLWScA (ORCPT ); Tue, 23 Dec 2008 13:32:00 -0500 Received: from [10.0.1.101] (p57B7DC44.dip.t-dialin.net [87.183.220.68]) by india601.server4you.de (Postfix) with ESMTPSA id 3767B2F8003; Tue, 23 Dec 2008 19:31:58 +0100 (CET) User-Agent: Thunderbird 2.0.0.18 (Windows/20081105) In-Reply-To: Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Tim Visher schrieb: > I'm now working on > compiling git under cygwin as the latest version cygwin installs for > you is 0.4! Have you seen msysgit (http://code.google.com/p/msysgit/), the easy route to git on Windows? It has all you need to check out and compile the latest version of git. Ren=C3=A9