From mboxrd@z Thu Jan 1 00:00:00 1970 From: Johannes Schindelin Subject: Re: git-merge adds test to a message -- bug? Date: Mon, 24 Mar 2008 12:08:59 +0100 (CET) Message-ID: References: <7vabko3dm2.fsf@gitster.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Cc: =?ISO-8859-15?Q?J=F6rg_Sommer?= , git@vger.kernel.org To: Junio C Hamano X-From: git-owner@vger.kernel.org Mon Mar 24 12:09:50 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1JdkYf-0007NI-14 for gcvg-git-2@gmane.org; Mon, 24 Mar 2008 12:09:41 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757651AbYCXLJA (ORCPT ); Mon, 24 Mar 2008 07:09:00 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757403AbYCXLJA (ORCPT ); Mon, 24 Mar 2008 07:09:00 -0400 Received: from mail.gmx.net ([213.165.64.20]:40900 "HELO mail.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1756855AbYCXLI7 (ORCPT ); Mon, 24 Mar 2008 07:08:59 -0400 Received: (qmail invoked by alias); 24 Mar 2008 11:08:57 -0000 Received: from host86-148-26-43.range86-148.btcentralplus.com (EHLO racer.home) [86.148.26.43] by mail.gmx.net (mp005) with SMTP; 24 Mar 2008 12:08:57 +0100 X-Authenticated: #1490710 X-Provags-ID: V01U2FsdGVkX1+GdTwK/JiGSaF2ByhZfEKyOtW4slz1Eb0IJJw3NC BNhetPAiFq+OMv X-X-Sender: gene099@racer.site In-Reply-To: <7vabko3dm2.fsf@gitster.siamese.dyndns.org> User-Agent: Alpine 1.00 (LSU 882 2007-12-20) X-Y-GMX-Trusted: 0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Hi, On Sun, 23 Mar 2008, Junio C Hamano wrote: > I unfortunately do not recall why _prepend_, and not _replace_, had to be > the right behaviour. http://article.gmane.org/gmane.comp.version-control.git/31896/match=git+merge+make+usable Hth, Dscho