merge marker problem

[Martin Pool]

On 14/09/05, John A Meinel <john at arbash-meinel.com> wrote:

> I see your point, but how else are you going to know that there wasn't a
> newline at the end of the file. If bzr was to silently include them,
> then it is secretly lying to you.

Perhaps it would be OK to have 

   <<<<<<< TREE (no newline at end of file)

Which reminds me that it might be nice to give more context there;
perhaps saying who wrote those lines and when.  I might add that to
the weave merge later.

The THIS/OTHER files will have the correct content.

> What does CVS/svn do?

I remember CVS doing what we currently do, i.e. putting the conflict
markers on the unterminated ultimate line.

-- 
Martin