Add an entry about the last merge.
Merge from upstream
Merge from upstream.
Reestablish an entry that was lost in one of the previous commits.