>>>>> "RS" == Robert Spier <rspier at pobox.com> writes: RS> On my todo list (in my personal RT) is a 'diff script' that RS> automatically does the appropriate diffs and presents it in an easy RS> form. Sounds a lot like FreeBSD's "mergemaster" program.