Still a bug in bzr.dev today.
This behaviour is consistent with CVS, but adding the newline would probably be better. As a compromise we could show
<<<<<<< THIS [no eol]
Still a bug in bzr.dev today.
This behaviour is consistent with CVS, but adding the newline would probably be better. As a compromise we could show
<<<<<<< THIS [no eol]