commit 6076fd1b157f5679276da6c0b6dfd413d841387c
author Anthony Sottile <asottile@umich.edu> Mon Jun 12 10:39:07 2017 -0700
committer Anthony Sottile <asottile@umich.edu> Mon Jun 12 10:39:07 2017 -0700
tree b0c860305013dcc422c16d3cce6f581582c7816a
parent 78818b90cd694c29333ba54d38f9e60b6359ccfc

Support rebase conflicts in check-merge-conflicts

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 d986998..7d87efc 100644
--- a/pre_commit_hooks/check_merge_conflict.py
+++ b/pre_commit_hooks/check_merge_conflict.py
@@ -15,7 +15,11 @@
 def is_in_merge():
     return (
         os.path.exists(os.path.join('.git', 'MERGE_MSG')) and
-        os.path.exists(os.path.join('.git', 'MERGE_HEAD'))
+        (
+            os.path.exists(os.path.join('.git', 'MERGE_HEAD')) or
+            os.path.exists(os.path.join('.git', 'rebase-apply')) or
+            os.path.exists(os.path.join('.git', 'rebase-merge'))
+        )
     )