From: Shawn O. Pearce Date: Sat, 25 Jul 2009 22:55:04 GMT Subject: Re: [JGIT PATCH 09/19] Refactor Config hierarchy to make IO more explicit Message-ID: <20090725225504.GG11191@spearce.org> In-Reply-To: <200907260054.06037.robin.rosenberg.lists@dewire.com> 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.