* contrib/hook-scripts/detect-merge-conflicts.sh   (SUSPICIOUS): Improve regex to avoid false-positives.
* contrib/hook-scripts/detect-merge-conflicts.sh
  (SUSPICIOUS): Improve regex to avoid false-positives.

Patch by: Bastiaan Veelo <Bastiaan.N.Veelo@ntnu.no>


git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@864666 13f79535-47bb-0310-9956-ffa450edef68

wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion