# HG changeset patch
# User Martin Geisler <martin@geisler.net>
# Date 1342652073 -7200
# Node ID c315842cb25f4a0dec2625acc32db7bc651144ec
# Parent  e2a0422f00f7262b40ab112a6e850478264ac247# Parent  98823bd0d697e067ae060f122a5ea7ca92e5e6a8
merge with stable

diff -r e2a0422f00f7 -r c315842cb25f mercurial/windows.py
--- a/mercurial/windows.py	Tue Jul 17 18:21:49 2012 +0200
+++ b/mercurial/windows.py	Thu Jul 19 00:54:33 2012 +0200
@@ -291,13 +291,6 @@
 def gethgcmd():
     return [sys.executable] + sys.argv[:1]
 
-def termwidth():
-    # cmd.exe does not handle CR like a unix console, the CR is
-    # counted in the line length. On 80 columns consoles, if 80
-    # characters are written, the following CR won't apply on the
-    # current line but on the new one. Keep room for it.
-    return 79
-
 def groupmembers(name):
     # Don't support groups on Windows for now
     raise KeyError