man mergemaster

-U Attempt to auto upgrade files that have not been user modified.