# HG changeset patch
# Parent 2e4f00de37e7b2c2320a55d626d87befda508e34

diff -r 2e4f00de37e7 Tools/scripts/diff.py
--- a/Tools/scripts/diff.py	Fri Apr 09 12:17:54 2010 +0300
+++ b/Tools/scripts/diff.py	Fri Apr 09 12:20:29 2010 +0300
@@ -13,8 +13,8 @@
 
     usage = "usage: %prog [options] fromfile tofile"
     parser = optparse.OptionParser(usage)
-    parser.add_option("-c", action="store_true", default=False, help='Produce a context format diff (default)')
-    parser.add_option("-u", action="store_true", default=False, help='Produce a unified format diff')
+    parser.add_option("-c", action="store_true", default=False, help='Produce a context format diff')
+    parser.add_option("-u", action="store_true", default=False, help='Produce a unified format diff (default)')
     parser.add_option("-m", action="store_true", default=False, help='Produce HTML side by side diff (can use -c and -l in conjunction)')
     parser.add_option("-n", action="store_true", default=False, help='Produce a ndiff format diff')
     parser.add_option("-l", "--lines", type="int", default=3, help='Set number of context lines (default 3)')
@@ -34,14 +34,14 @@
     fromlines = open(fromfile, 'U').readlines()
     tolines = open(tofile, 'U').readlines()
 
-    if options.u:
-        diff = difflib.unified_diff(fromlines, tolines, fromfile, tofile, fromdate, todate, n=n)
+    if options.c:
+        diff = difflib.context_diff(fromlines, tolines, fromfile, tofile, fromdate, todate, n=n)
     elif options.n:
         diff = difflib.ndiff(fromlines, tolines)
     elif options.m:
         diff = difflib.HtmlDiff().make_file(fromlines,tolines,fromfile,tofile,context=options.c,numlines=n)
     else:
-        diff = difflib.context_diff(fromlines, tolines, fromfile, tofile, fromdate, todate, n=n)
+        diff = difflib.unified_diff(fromlines, tolines, fromfile, tofile, fromdate, todate, n=n)
 
     sys.stdout.writelines(diff)