mirror of
https://github.com/pre-commit/pre-commit.git
synced 2026-01-14 04:50:20 -06:00
Add logging message.
This commit is contained in:
@@ -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()
|
||||
|
||||
Reference in New Issue
Block a user