Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S261422AbVDPIha (ORCPT ); Sat, 16 Apr 2005 04:37:30 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261516AbVDPIha (ORCPT ); Sat, 16 Apr 2005 04:37:30 -0400 Received: from zeus1.kernel.org ([204.152.191.4]:57741 "EHLO zeus1.kernel.org") by vger.kernel.org with ESMTP id S261422AbVDPIh0 (ORCPT ); Sat, 16 Apr 2005 04:37:26 -0400 Date: Sat, 16 Apr 2005 01:35:41 -0700 From: Paul Jackson To: Catalin Marinas 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 Message-Id: <20050416013541.2e6f6c60.pj@sgi.com> In-Reply-To: References: <1113174621.9517.509.camel@gaston> <425A10EA.7030607@pobox.com> Organization: SGI X-Mailer: Sylpheed version 1.0.0 (GTK+ 1.2.10; i686-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 663 Lines: 16 > "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. Is this the merge command you have in mind here? -- I won't rest till it's the best ... Programmer, Linux Scalability Paul Jackson 1.650.933.1373, 1.925.600.0401 - 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/