which doesn't like it when you pass it absolute paths; so fall back if it doesn't work.
Merge remote-tracking branch upstream/$:{upbranch}