mergemaster goof when src upgrading 7.0 -> 7.1

[Robert Huff]

Yuri Pankov writes:

>  > Also: most scripts updated by mergemaster during 7.0->7.1 are only
>  > version numbering diffs. Is there no smarter way to do this, apart from
>  > typing 'i' every time?
>  
>  I think you want -U option (auto upgrade files that have not been
>  modified by user) along with -i (install missing files).

	How does it deteremine what's been user-modified?  I've got a
few things that have local edits that, for reasons of laziness,
still have the same version tag. 


				Robert Huff