From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: Re: [PATCH 1/2] merge-recursive.c: Fix case-changing merge. Date: Thu, 08 May 2014 12:45:03 -0700 Message-ID: References: <536B4680.1010806@web.de> <1399569814-20644-1-git-send-email-dturner@twopensource.com> <1399569814-20644-2-git-send-email-dturner@twopensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: git@vger.kernel.org, David Turner To: dturner@twopensource.com X-From: git-owner@vger.kernel.org Thu May 08 21:45:17 2014 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WiUFo-0002OV-Sx for gcvg-git-2@plane.gmane.org; Thu, 08 May 2014 21:45:17 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755563AbaEHTpK (ORCPT ); Thu, 8 May 2014 15:45:10 -0400 Received: from smtp.pobox.com ([208.72.237.35]:53579 "EHLO smtp.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755560AbaEHTpI (ORCPT ); Thu, 8 May 2014 15:45:08 -0400 Received: from smtp.pobox.com (unknown [127.0.0.1]) by pb-smtp0.pobox.com (Postfix) with ESMTP id 35C0D16DED; Thu, 8 May 2014 15:45:08 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; s=sasl; bh=tfPzaYUbvFuUdYXoofUB29//yfY=; b=x7WJFb QfYZuUoY8m0rcQUGPcP6Gf8DBFtvITlvPBbDlcLIXxqpdP3A5uxPyxPvIweVJgG9 /9bgYOOysoXpw+1ao3MA5majH58VRYeKCv+br5gea57WERqlTvc1to9foML7VksJ Kqa5FovtK0V8mB12tzpHTFNxOIWAkvFiPhLlY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; q=dns; s=sasl; b=GQkmH99TsFenNE6jsoSXzWkWpIiCpFLa kT4MPr4qcbFaeFkXfYwTtT8JLDNGCsHF3zXSnKZ0LFRHYZj4FhBi1sMRaGbWhGK9 uLPKKfenmV8riok4R0aDUSzHmnlp40liMAe1XSlB+hLUtWzW8ITBcwmQV5xU8Imp q197zvUZgBw= Received: from pb-smtp0.int.icgroup.com (unknown [127.0.0.1]) by pb-smtp0.pobox.com (Postfix) with ESMTP id 2B54F16DEC; Thu, 8 May 2014 15:45:08 -0400 (EDT) Received: from pobox.com (unknown [72.14.226.9]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by pb-smtp0.pobox.com (Postfix) with ESMTPSA id E858B16DE0; Thu, 8 May 2014 15:45:04 -0400 (EDT) In-Reply-To: <1399569814-20644-2-git-send-email-dturner@twopensource.com> (dturner@twopensource.com's message of "Thu, 8 May 2014 10:23:33 -0700") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (gnu/linux) X-Pobox-Relay-ID: 40885DB6-D6E9-11E3-BCB3-9CEB01674E00-77302942!pb-smtp0.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Thanks; I think this is identical to what we already have on the dt/merge-recursive-case-insensitive topic.