diff -r d341677d667d -r e470f12d7d05 contrib/check-config.py
--- a/contrib/check-config.py	Tue Jul 18 07:47:28 2017 -0700
+++ b/contrib/check-config.py	Tue Jul 18 06:27:36 2017 -0700
@@ -48,7 +48,9 @@
         prevname = ''
         confsect = ''
         carryover = ''
+        linenum = 0
         for l in open(f):
+            linenum += 1
 
             # check topic-like bits
             m = re.match('\s*``(\S+)``', l)
@@ -110,9 +112,10 @@
                     default = '<variable>'
                 if (name in foundopts and (ctype, default) != foundopts[name]
                     and name not in allowinconsistent):
-                    print(l)
+                    print(l.rstrip())
                     print("conflict on %s: %r != %r" % (name, (ctype, default),
                                                         foundopts[name]))
+                    print("at %s:%d:" % (f, linenum))
                 foundopts[name] = (ctype, default)
                 carryover = ''
             else: