From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Shawn O. Pearce" Subject: Re: [JGIT PATCH 09/19] Refactor Config hierarchy to make IO more explicit Date: Sat, 25 Jul 2009 15:55:04 -0700 Message-ID: <20090725225504.GG11191@spearce.org> References: <1248547982-4003-1-git-send-email-spearce@spearce.org> <1248547982-4003-9-git-send-email-spearce@spearce.org> <1248547982-4003-10-git-send-email-spearce@spearce.org> <200907260054.06037.robin.rosenberg.lists@dewire.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: git@vger.kernel.org, Constantine Plotnikov To: Robin Rosenberg X-From: git-owner@vger.kernel.org Sun Jul 26 00:55:49 2009 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 1MUq9d-0003Sp-9O for gcvg-git-2@gmane.org; Sun, 26 Jul 2009 00:55:49 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752840AbZGYWzF (ORCPT ); Sat, 25 Jul 2009 18:55:05 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752816AbZGYWzF (ORCPT ); Sat, 25 Jul 2009 18:55:05 -0400 Received: from george.spearce.org ([209.20.77.23]:58143 "EHLO george.spearce.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752765AbZGYWzE (ORCPT ); Sat, 25 Jul 2009 18:55:04 -0400 Received: by george.spearce.org (Postfix, from userid 1001) id 8FE85381FE; Sat, 25 Jul 2009 22:55:04 +0000 (UTC) Content-Disposition: inline In-Reply-To: <200907260054.06037.robin.rosenberg.lists@dewire.com> User-Agent: Mutt/1.5.17+20080114 (2008-01-14) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Robin Rosenberg wrote: > > This one does not apply for the Config class here. Did you apply with --whitespace=strip or something and fall afoul of a merge conflict due to changed context? -- Shawn.