K 10
svn:author
V 6
rpaulo
K 8
svn:date
V 27
2008-09-03T23:53:36.912858Z
K 7
svn:log
V 129
Remove the check for "=======" because that generates many false
positives and enable back the detect-merge-conflicts.sh script.

END