Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S261639AbVDKAQL (ORCPT ); Sun, 10 Apr 2005 20:16:11 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261643AbVDKAQL (ORCPT ); Sun, 10 Apr 2005 20:16:11 -0400 Received: from fire.osdl.org ([65.172.181.4]:30934 "EHLO smtp.osdl.org") by vger.kernel.org with ESMTP id S261639AbVDKAQK (ORCPT ); Sun, 10 Apr 2005 20:16:10 -0400 Date: Sun, 10 Apr 2005 17:15:53 -0700 From: "Randy.Dunlap" To: Paul Jackson Cc: pasky@ucw.cz, torvalds@osdl.org, mingo@elte.hu, willy@w.ods.org, linux-kernel@vger.kernel.org, ross@jose.lug.udel.edu Subject: Re: [ANNOUNCE] git-pasky-0.1 Message-Id: <20050410171553.1dc98b77.rddunlap@osdl.org> In-Reply-To: <20050410162311.0c6da79c.pj@engr.sgi.com> References: <20050410024157.GE3451@pasky.ji.cz> <20050410162723.GC26537@pasky.ji.cz> <20050410173349.GA17549@elte.hu> <20050410174221.GD7858@alpha.home.local> <20050410174512.GA18768@elte.hu> <20050410184522.GA5902@pasky.ji.cz> <20050410222737.GC5902@pasky.ji.cz> <20050410162311.0c6da79c.pj@engr.sgi.com> Organization: OSDL X-Mailer: Sylpheed version 1.0.4 (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: 620 Lines: 21 On Sun, 10 Apr 2005 16:23:11 -0700 Paul Jackson wrote: | Petr wrote: | > That reminds me, is there any | > tool which will take .rej files and throw them into the file to create | > rcsmerge-like conflicts? | | Check out 'wiggle' | http://www.cse.unsw.edu.au/~neilb/source/wiggle/ or Chris Mason's 'rej' program: ftp://ftp.suse.com/pub/people/mason/rej/ --- ~Randy - 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/