On Thu, 18 Feb 2010 21:41:35 -0500 Jeff Garzik <jeff@xxxxxxxxxx> 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 -- To unsubscribe from this list: send the line "unsubscribe hail-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
