From 3ebf976afbadc74882e51c27475594d9f24444ce Mon Sep 17 00:00:00 2001 From: Anthony Sottile Date: Tue, 15 Apr 2014 09:31:40 -0700 Subject: [PATCH] Add logging message. --- pre_commit/git.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pre_commit/git.py b/pre_commit/git.py index 79507680..847aedf4 100644 --- a/pre_commit/git.py +++ b/pre_commit/git.py @@ -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()