mirror/pre-commit
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit.git synced 2026-01-15 05:20:20 -06:00
Code Issues Packages Projects Releases Wiki Activity

Various cleanup.

Browse Source
This commit is contained in:
Anthony Sottile
2014-06-06 07:38:25 -07:00
parent bf912cfebb
commit 01b557c497
12 changed files with 85 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pre_commit/git.py
View File

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