[SVN-3047] diff3 implementation should deal better with files (or props) that don't end in newlines

• Type: Bug
• Status: Open
• Priority: Trivial
• Resolution: Unresolved
• Affects Version/s: all
• Component/s: libsvn_diff
• Labels: bite-sized
• Assignee: Unassigned
• Reporter: David Samuel Glasser
• Created: 12/Dec/07 23:46
• Updated: 12/Dec/19 10:06

Description

Hmm, so I got a prop conflict on 1.4.x and selected (e)dit and got this:

<<<<<<< (modified)
/trunk:1-19523,[...],27263=======
/trunk:1-19523,[...],26156>>>>>>> (latest)

Shouldn't there be newlines before the middle and end conflict markers?

From: David Glasser, Date: 2007-11-23, Subject: "prop conflict editing and newlines", http://svn.haxx.se/dev/archive-2007-11/0982.shtml