Tolerate tabs or other funny spacing in track line.
Merge remote-tracking branch upstream/$:{upbranch}