--- a/contrib/simplemerge Tue Apr 16 21:14:50 2013 +0200
+++ b/contrib/simplemerge Wed Apr 17 03:39:36 2013 +0200
@@ -44,7 +44,7 @@
try:
for fp in (sys.stdin, sys.stdout, sys.stderr):
util.setbinary(fp)
-
+
opts = {}
try:
args = fancyopts.fancyopts(sys.argv[1:], options, opts)