From mboxrd@z Thu Jan  1 00:00:00 1970
From: Pete Zaitcev <zaitcev@redhat.com>
Subject: Re: [Patch 1/1] CLD: Introduce the "New CLD" API
Date: Fri, 19 Feb 2010 15:23:08 -0700
Message-ID: <20100219152308.25f48180@redhat.com>
References: <20100207121550.7ee94ff6@redhat.com>
	<4B774942.9040308@garzik.org>
	<20100217170521.3a328044@redhat.com>
	<4B7C957C.8090109@garzik.org>
	<20100218183514.4898ff62@redhat.com>
	<4B7DFA5F.5050705@garzik.org>
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
Return-path: <hail-devel-owner@vger.kernel.org>
In-Reply-To: <4B7DFA5F.5050705@garzik.org>
Sender: hail-devel-owner@vger.kernel.org
List-ID: <hail-devel.vger.kernel.org>
Content-Type: text/plain; charset="us-ascii"
To: Jeff Garzik <jeff@garzik.org>
Cc: Project Hail List <hail-devel@vger.kernel.org>

On Thu, 18 Feb 2010 21:41:35 -0500
Jeff Garzik <jeff@garzik.org> wrote:

> > I imagine the numbers of '>>>>>>' clauses I have to fix after the
> > next "git pull". Oh well.
> 
> If you perform the substitutions on your local working tree using the 
> sar script, the diff between git HEAD and your local working tree should 
> provide something manageable.

Yep, I paniced too early. One :%s/\<nsp\>/nsess/g was sufficient.

-- Pete