Only log relevant diff and conflicts

[jdkandersson]

#113 introduces checks for conflicting changes and logs the full file content. This can be improved by only logging the relevant part of the content (e.g., just the conflicts with surrounding content)