Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S261896AbVDRISq (ORCPT ); Mon, 18 Apr 2005 04:18:46 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261904AbVDRISq (ORCPT ); Mon, 18 Apr 2005 04:18:46 -0400 Received: from cam-admin0.cambridge.arm.com ([193.131.176.58]:37839 "EHLO cam-admin0.cambridge.arm.com") by vger.kernel.org with ESMTP id S261896AbVDRISp (ORCPT ); Mon, 18 Apr 2005 04:18:45 -0400 To: Paul Jackson Cc: torvalds@osdl.org, jgarzik@pobox.com, benh@kernel.crashing.org, linux-kernel@vger.kernel.org, James.Bottomley@SteelEye.com, dwmw2@infradead.org Subject: Re: New SCM and commit list References: <1113174621.9517.509.camel@gaston> <425A10EA.7030607@pobox.com> <20050416013541.2e6f6c60.pj@sgi.com> From: Catalin Marinas Date: Mon, 18 Apr 2005 09:18:16 +0100 In-Reply-To: <20050416013541.2e6f6c60.pj@sgi.com> (Paul Jackson's message of "Sat, 16 Apr 2005 01:35:41 -0700") Message-ID: User-Agent: Gnus/5.1007 (Gnus v5.10.7) Emacs/21.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 670 Lines: 18 Paul Jackson wrote: >> "merge" does a better job than "diff3" since it can resolve the > > The merge command I know of is part of Tichy's RCS tools, > and calls diff3, and has no inherent superior abilities. You are right, I missed some diff3 options. It looks like "diff3 -mE" generates the same output as "merge" (i.e. solving the identical changes in the derived files). Sorry for the noise :-) -- Catalin - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/