commit 86d844680015d60043a404f0b021463027b89e43
author Guy Kisel <gkisel@riotgames.com> Fri Mar 13 16:32:21 2015 -0700
committer Guy Kisel <gkisel@riotgames.com> Fri Mar 13 16:32:21 2015 -0700
tree c1d91ed6ddd7fe75f4c8f515f742673abaa1eaf1
parent 779a42919a47560429b21dcc80a4a106bcd99316

Fix off by one error in line number enumeration

pre_commit_hooks/check_merge_conflict.py

diff --git a/pre_commit_hooks/check_merge_conflict.py b/pre_commit_hooks/check_merge_conflict.py
index fc211bc..ac405b2 100644
--- a/pre_commit_hooks/check_merge_conflict.py
+++ b/pre_commit_hooks/check_merge_conflict.py
@@ -22,7 +22,7 @@
             for i, line in enumerate(inputfile):
                 for pattern in CONFLICT_PATTERNS:
                     if line.startswith(pattern):
-                        print(WARNING_MSG.format(pattern, filename, i))
+                        print(WARNING_MSG.format(pattern, filename, i + 1))
                         retcode = 1
 
     return retcode