mirror/pre-commit
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit.git synced 2026-01-13 12:30:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflict detection for cherry-pick conflict.

Browse Source
This commit is contained in:
Anthony Sottile
2014-06-13 06:50:17 -07:00
parent 5a1accd697
commit c4e4c2dccb
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pre_commit/git.py
View File

@@ -23,7 +23,10 @@ def get_root():
def is_in_merge_conflict():
return os.path.exists(os.path.join('.git', 'MERGE_MSG'))
return (
os.path.exists(os.path.join('.git', 'MERGE_MSG')) and
os.path.exists(os.path.join('.git', 'MERGE_HEAD'))
)
def parse_merge_msg_for_conflicts(merge_msg):