Add check for merge conflict markers

Change-Id: I55f8f6775f4c33ca9c9687fe2182215cd7fe6693
Reviewed-on: http://gerrit.causes.com/37943
Tested-by: jenkins <jenkins@causes.com>
Reviewed-by: Shane da Silva <shane@causes.com>
Improve regex for MergeConflicts hook

The previous regex could report a false positive if the literal string
of seven '<' characters appeared in the middle of a line. Even if this
is unlikely, we can easily guard against this by anchoring the regex at
the beginning of the line.

Change-Id: I79ea46fbf80c75f7e7b4672ef457e6f52c6cd120
Reviewed-on: http://gerrit.causes.com/37944
Tested-by: jenkins <jenkins@causes.com>
Reviewed-by: Shane da Silva <shane@causes.com>
Update changelog with MergeConflicts hook

Change-Id: If53526fc68f403cc797df4b0e5df7752726ad1e9
Reviewed-on: http://gerrit.causes.com/37945
Tested-by: jenkins <jenkins@causes.com>
Reviewed-by: Shane da Silva <shane@causes.com>