Received: from fallback.us4.outblaze.com (fallback.us4.outblaze.com [205.158.62.120]) by sdf.lonestar.org (8.12.10/8.12.10) with ESMTP id iAM5KPvo026157 for ; Mon, 22 Nov 2004 05:20:26 GMT Received: from cspf.us4.outblaze.com (cspf.us4.outblaze.com [205.158.62.117]) by fallback.us4.outblaze.com (Postfix) with ESMTP id 5586F1C1877A for ; Mon, 22 Nov 2004 03:32:29 +0000 (GMT) Received: from spf1.us4.outblaze.com (spf1.us4.outblaze.com [205.158.62.23]) by cspf.us4.outblaze.com (Postfix) with ESMTP id 2BFB01B40A7 for ; Mon, 22 Nov 2004 03:32:29 +0000 (GMT) Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by spf1.us4.outblaze.com (Postfix) with ESMTP id A6E2553A7B for ; Mon, 22 Nov 2004 03:32:28 +0000 (GMT) Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CW55I-0002rj-Ge for migo@homemail.com; Sun, 21 Nov 2004 22:41:48 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33) id 1CW54n-0002rB-Vd for gnu-arch-users@gnu.org; Sun, 21 Nov 2004 22:41:18 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33) id 1CW54n-0002qx-C8 for gnu-arch-users@gnu.org; Sun, 21 Nov 2004 22:41:17 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CW54n-0002qu-9H for gnu-arch-users@gnu.org; Sun, 21 Nov 2004 22:41:17 -0500 Received: from [66.216.124.41] (helo=server4.panoramicfeedback.com) by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168) (Exim 4.34) id 1CW4vg-0002ib-D4 for gnu-arch-users@gnu.org; Sun, 21 Nov 2004 22:31:52 -0500 Received: from [192.168.0.7] (server4.panoramicfeedback.com [66.216.124.41]) by server4.panoramicfeedback.com (8.12.3/8.12.3/Debian-6.6) with ESMTP id iAM3VEil001440; Sun, 21 Nov 2004 22:31:15 -0500 Message-ID: <41A15D82.20902@panoramicfeedback.com> Date: Sun, 21 Nov 2004 22:31:14 -0500 From: Aaron Bentley User-Agent: Mozilla Thunderbird 0.8 (X11/20040926) X-Accept-Language: en-us, en MIME-Version: 1.0 To: John A Meinel Subject: Re: [Gnu-arch-users] diff markers/ star merge References: <1101070919.6134.11.camel@localhost.localdomain> <41A112A4.4070207@panoramicfeedback.com> <20041121222245.GC23410@rogers.com> <41A1161D.7020708@arbash-meinel.com> <41A1237C.6020303@panoramicfeedback.com> <41A12400.9080901@arbash-meinel.com> <41A15380.6020907@panoramicfeedback.com> <41A15719.60607@arbash-meinel.com> In-Reply-To: <41A15719.60607@arbash-meinel.com> X-Enigmail-Version: 0.86.1.0 X-Enigmail-Supports: pgp-inline, pgp-mime Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Panometrics-MailScanner: Found to be clean Cc: arch , "Dimitrie O. Paun" , Zenaan Harkness X-BeenThere: gnu-arch-users@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: a discussion list for all things arch-ish List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: gnu-arch-users-bounces+migo=homemail.com@gnu.org Errors-To: gnu-arch-users-bounces+migo=homemail.com@gnu.org Status: RO Content-Length: 517 Lines: 20 John A Meinel wrote: > Who broke star-merge --three-way? I don't believe I did anything with > it. (naturally, I could be wrong.) > > And, of course, what is broken about it? Your win32 patch causes diff3 to be invoked with a --binary parameter. There's no --binary parameter for diff3. Aaron _______________________________________________ Gnu-arch-users mailing list Gnu-arch-users@gnu.org http://lists.gnu.org/mailman/listinfo/gnu-arch-users GNU arch home page: http://savannah.gnu.org/projects/gnu-arch/