From mboxrd@z Thu Jan 1 00:00:00 1970 Message-ID: From: "Steve Simon" Date: Sun, 4 Oct 2009 18:17:02 +0100 To: 9fans@9fans.net In-Reply-To: <4fe555158822df97a22b2076cc02e52a@9netics.com> MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit Subject: Re: [9fans] /sys/src/9/ip/ip.h Topicbox-Message-UUID: 7d619e90-ead5-11e9-9d60-3106f5b1d025 > perhaps the elimination of all traces of IL is a little too thorough? I see no real harm in IL but, just a suggestion, you could do a pull -s, and then use diff3 (in my contrib) to do a merge between ip.h.orig, yesterday(1)'s version and the newly pulled code. having said this I still have it on my To-do list to add a -m (merge) option to replica to do just this; one day. -Steve