add 'pulled from/into wrong branch'

my text editor automatically trims trailing spaces, so that happened too I guess.