merge marker problem

[Stefan (metze) Metzmacher]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi *,

when files doesn't end with '\n'
the cnflict markers, are a bit strange

metze at routox:/home/Projects/SCM/test-bzr/foo.metze> cat file1.txt
File1:

text1
text2
text3
<<<<<<< TREE
text4
text8
text10=======
text4
text5
text6
text7
text9>>>>>>> MERGE-SOURCE
metze at routox:/home/Projects/SCM/test-bzr/foo.metze> cat file1.txt.THIS
File1:

text1
text2
text3
text4
text8
text10metze at routox:/home/Projects/SCM/test-bzr/foo.metze> cat file1.txt.OTHER
File1:

text1
text2
text3
text4
text5
text6
text7
text9metze at routox:/home/Projects/SCM/test-bzr/foo.metze> cat file1.txt.BASE
File1:

text1
text2
text3
text4metze at routox:/home/Projects/SCM/test-bzr/foo.metze>

- --
metze

Stefan Metzmacher <metze at samba.org> www.samba.org
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3-nr1 (Windows XP)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFDJ+fxm70gjA5TCD8RAgn9AKCoWwElCCt2NOREjpmXFcK2DoE/IwCfRTR4
FcnGO8eAgftcJqF1AJNrnHI=
=cOoS
-----END PGP SIGNATURE-----