Commits

Georg Brandl committed 9a661e2 Merge
  • Participants
  • Parent commits c2ebdb2, 148d4e8

Comments (0)

Files changed (1)

File hgcodesmell.py

 set_trace = (re.compile(r'\bpdb\.set_trace\(\)'), 'set_trace')
 vim_cmd = (re.compile(r':(w|wq|q|x)$', re.M), 'vim exit command')
 windows_nl = (re.compile(r'\r'), 'Windows newline')
+merged_file = (re.compile(r'(>>>>>>>|<<<<<<<)'), 'Merged file')
 
 # the master dict maps glob patterns to a list of smelly patterns
 SMELLY_STUFF = {
     '*.js': [debugger_stmt,],
     '*.py': [print_stmt, zero_div, set_trace],
-    '*': [vim_cmd],
+    '*': [vim_cmd, merged_file],
 }
 
 if os.name != 'nt':