merge: different msg if nothing was merged
Merge remote-tracking branch 'origin/master' into external-test