commit 64b9f3dcf0dcd16ec6011fc9111b3fd81e16fd80
author Vinay Karanam <vinayinvicible@gmail.com> Tue Jun 26 23:34:04 2018 +0530
committer Vinay Karanam <vinayinvicible@gmail.com> Tue Jun 26 23:59:40 2018 +0530
tree df51db9d23fd7b646e4624d982aa8c0160af9de8
parent 9bf684c131befc87304489719223db5fb29f9ac7

Added --assume-in-merge option for check-merge-conflict

Fixes #300

pre_commit_hooks/check_merge_conflict.py

diff --git a/pre_commit_hooks/check_merge_conflict.py b/pre_commit_hooks/check_merge_conflict.py
index 5035b6d..6db5efe 100644
--- a/pre_commit_hooks/check_merge_conflict.py
+++ b/pre_commit_hooks/check_merge_conflict.py
@@ -26,9 +26,10 @@
 def detect_merge_conflict(argv=None):
     parser = argparse.ArgumentParser()
     parser.add_argument('filenames', nargs='*')
+    parser.add_argument('--assume-in-merge', action='store_true')
     args = parser.parse_args(argv)
 
-    if not is_in_merge():
+    if not is_in_merge() and not args.assume_in_merge:
         return 0
 
     retcode = 0