third-party/pre-commit
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit.git synced 2026-02-17 00:04:42 +04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add logging message.

Browse source
This commit is contained in:
Anthony Sottile 2014-04-15 09:31:40 -07:00
parent 5810ee4315
commit 3ebf976afb
1 changed files with 1 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
pre_commit/git.py
View file

@ -35,6 +35,7 @@ def parse_merge_msg_for_conflicts(merge_msg):
@memoize_by_cwd
def get_conflicted_files():
logger.info('Checking merge-conflict files only.')
# Need to get the conflicted files from the MERGE_MSG because they could
# have resolved the conflict by choosing one side or the other
merge_msg = open(os.path.join('.git', 'MERGE_MSG')).read()