[Python-checkins] cpython: White space and merge cleanup.

[terry.reedy]

http://hg.python.org/cpython/rev/21c5e6b4f68b
changeset:   88749:21c5e6b4f68b
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Sun Jan 26 20:24:35 2014 -0500
summary:
  White space and merge cleanup.

files:
  Lib/idlelib/idle_test/test_calltips.py |  4 ----
  1 files changed, 0 insertions(+), 4 deletions(-)


diff --git a/Lib/idlelib/idle_test/test_calltips.py b/Lib/idlelib/idle_test/test_calltips.py
--- a/Lib/idlelib/idle_test/test_calltips.py
+++ b/Lib/idlelib/idle_test/test_calltips.py
@@ -69,12 +69,8 @@
         self.assertEqual(signature(textwrap.TextWrapper), '''\
 (width=70, initial_indent='', subsequent_indent='', expand_tabs=True,
     replace_whitespace=True, fix_sentence_endings=False, break_long_words=True,
-<<<<<<< local
     drop_whitespace=True, break_on_hyphens=True, tabsize=8, *, max_lines=None,
     placeholder=' [...]')''')
-=======
-    drop_whitespace=True, break_on_hyphens=True, tabsize=8)''')
->>>>>>> other
 
     def test_docline_truncation(self):
         def f(): pass

-- 
Repository URL: http://hg.python.org/cpython