> 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