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

Environments are now installed to version-specific locations. Resolves #229

Browse Source
This commit is contained in:
Anthony Sottile
2015-05-16 19:16:23 -04:00
parent 154d918ff1
commit 45d4a195ef
9 changed files with 71 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pre_commit/git.py
View File

@@ -37,9 +37,10 @@ def is_in_merge_conflict():
def parse_merge_msg_for_conflicts(merge_msg):
# Conflicted files start with tabs
return [
line.strip()
line.lstrip('#').strip()
for line in merge_msg.splitlines()
if line.startswith('\t')
# '#\t' for git 2.4.1
if line.startswith(('\t', '#\t'))
]