msgmerge: swap merge arguments

update_entry, base_entry ->
base_entry, update_entry

Merge methods merge information in update_entry into base_entry.