Support merge commits

[alicederyn]

While rebasing onto main is usually preferred, sometimes during github review cycles it's cleaner to instead merge in latest changes from main (there's even a button on the UI). It would be nice if the "N unmerged" notification took these into account, as currently it shows branches as being behind main even when they are not.