This patch adds a function to check if the file is a conflict file before trying to parse it.
This allows us to do a quick check for a file and show error message. Instead of wasting time in trying to parse a file that is not a conflict file.
Original and altered files.
Logged In: YES user_id=631874 Originator: YES
Committed to SVN trunk. Completed: At revision: 4964
Log in to post a comment.
Original and altered files.
Logged In: YES
user_id=631874
Originator: YES
Committed to SVN trunk.
Completed: At revision: 4964