Update2: Recognize merges this->another in addition to another->this

Update2: Recognize merges this->another in addition to another->this

This is useful whenever somebody merges two branches and pushes the
result to both of them.

However, both branches must be local. When "git pull" merges with
a remote tracking branch, the commit message includes the name
of the remote, so our test does not trigger (intentionally).