Re: join not producing conflict

[Paul Edwards]

"Mark D. Baushke" <mdb@cvshome.org> wrote in message 
news:mailman.2041.1066699357.21628.bug-cvs@gnu.org...
>> > It would be useful if you could test it to make sure it does the
>> > right thing from your point of view.
>
>> Ok, I'll try to test it at work and see how it goes.

I have now tested it at work, and it works perfectly.

> The only real question in my mind for this patch is if it should somehow
> strive to add conflict markers, but I didn't see an 'easy' way to do it.

It does add conflict markers if you have changed the same
line (compared to base).

If you have made independent changes, it doesn't add conflict
markers.

ie its behaviour is totally correct.  I didn't see anything wrong,
and don't see why you would seek to make any changes other
than the one you have already made.

BFN.  Paul.