: 
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit


minor sidenote: the 'ed' function pass in etcupdate is extremely
confusing. I still am unsure what the prompts mean after I exit from a
merge round, and I often see failing ed commandstreams rushing past my
window.

if you have just merged, which of the options do you want? 

-G