git generated commit message for merge conflict fix

NO_JIRA

Author: siong-chin

main/githooks.py

@@ -782,7 +782,7 @@ def check_commit_msg(message, files):
     does not contain required marker.
 
     '''
-    if re.match(r'^Merge branch \'.+?\'( of [^\s]+)? into .+', message):
+    if re.match(r'^Merge (branch|commit) \'.+?\'( of [^\s]+)? into .+', message):
         # Not checking for JIRA in commit message generated by github
         pass
     elif NO_JIRA_MARKER not in message:
@@ -838,6 +838,7 @@ def _test(input, is_good=True):
         _test("Merge branch 'main' into my_branch")
         _test("Merge branch 'branch_1' into branch_2")
         _test("Merge branch 'jira_pyapi_123_abc' of github.com:ccdc-confidential/cpp-apps-main into jira_pyapi_123_abc")
+        _test("Merge commit 'abcdef' into jira_mer_123_abc")
         _test('I forgot to add the jira marker!', False)
         _test('Close but no cigar abc-1234', False)