From mboxrd@z Thu Jan 1 00:00:00 1970 From: Petr Baudis Subject: Re: [RFC] Merge strategy 'applyreject' Date: Wed, 13 Sep 2006 23:50:49 +0200 Message-ID: <20060913215049.GP18896@pasky.or.cz> References: <20060913210817.GA30782@spearce.org> <20060913211617.GJ23891@pasky.or.cz> <7v1wqf789j.fsf@assigned-by-dhcp.cox.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: git@vger.kernel.org, Shawn Pearce X-From: git-owner@vger.kernel.org Wed Sep 13 23:51:02 2006 Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by ciao.gmane.org with esmtp (Exim 4.43) id 1GNcdF-0008Cq-3e for gcvg-git@gmane.org; Wed, 13 Sep 2006 23:50:57 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751216AbWIMVuw (ORCPT ); Wed, 13 Sep 2006 17:50:52 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751218AbWIMVuw (ORCPT ); Wed, 13 Sep 2006 17:50:52 -0400 Received: from w241.dkm.cz ([62.24.88.241]:9956 "EHLO machine.or.cz") by vger.kernel.org with ESMTP id S1751216AbWIMVuv (ORCPT ); Wed, 13 Sep 2006 17:50:51 -0400 Received: (qmail 8895 invoked by uid 2001); 13 Sep 2006 23:50:49 +0200 To: Junio C Hamano Content-Disposition: inline In-Reply-To: <7v1wqf789j.fsf@assigned-by-dhcp.cox.net> X-message-flag: Outlook : A program to spread viri, but it can do mail too. User-Agent: Mutt/1.5.11 Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: Dear diary, on Wed, Sep 13, 2006 at 11:43:04PM CEST, I got a letter where Junio C Hamano said that... > Petr Baudis writes: > > .rej files, what a nuisance to handle those... :) > > You were who asked for "apply --reject", weren't you? Yes, but the point of that was obviously different. (It's a nuisance, but only when compared to the conflict markers (yes, a matter of opinion of course).) Thanks for it, BTW! -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ Snow falling on Perl. White noise covering line noise. Hides all the bugs too. -- J. Putnam