For myself at least, i find reading the diffs (either context or uni)
   when doing it that way much, much easier than what you did...
   
   That helps (me, at least) when looking at the diffs to see what local
   changes remain.



yeah, i like that...

i'll try to get around to changing to something like that... unless
someone else beats me too it.


.mrg.