r864666 | dlr | 2007-04-16 13:45:22 -0500 (Mon, 16 Apr 2007) * contrib/hook-scripts/detect-merge-conflicts.sh (SUSPICIOUS): Improve regex to avoid false-positives. Patch by: Bastiaan Veelo <Bastiaan.N.Veelo@ntnu.no>