I'm trying to commit dirrectory and svn fails with message:
D:\path\file.ext Commit failed (details follow): Commit blocked by pre-commit hook (exit code 255) with output: Got 1 errors: * Block Merge Conflicts addon failed: Some parts of your commit look suspiciously like merge conflict markers. Please double-check your diff and try committing again. To really commit, have your admin disable the 'block merge conflicts' pre-commit hook. (ref svn07:4hSwdSwjOkKgIp3G) (ref svn07:Up2uVRcH74KRkoHB)
Any ideas what it can be and how to fix it? Thank you in advance!