# HG changeset patch
# User catherine@cordelia
# Date 1207186176 14400
# Node ID de6278a3bf538f1a2e0e070192efd5483478aceb
# Parent  4931f32c8ff5bea4be9178f566fac2fa93705aa0
adding compare help

diff -r 4931f32c8ff5 -r de6278a3bf53 mysqlpy.py
--- a/mysqlpy.py	Wed Apr 02 20:55:23 2008 -0400
+++ b/mysqlpy.py	Wed Apr 02 21:29:36 2008 -0400
@@ -76,7 +76,7 @@
         from gv$session_longops
         where time_remaining>0;
         '''
-
+       
     def do_top9i(self,args):
         '''Runs query_top9i defined above, to display active sessions in Oracle 9i'''
         self.do_select(self.query_top9i)
diff -r 4931f32c8ff5 -r de6278a3bf53 sqlpyPlus.py
--- a/sqlpyPlus.py	Wed Apr 02 20:55:23 2008 -0400
+++ b/sqlpyPlus.py	Wed Apr 02 21:29:36 2008 -0400
@@ -382,7 +382,7 @@
         """Lists available first-character shortcuts
         (i.e. '!dir' is equivalent to 'shell dir')"""
         for (scchar, scto) in self.shortcuts.items():
-            self.stdout.write('%s: %s\n') % (scchar, scto)
+            print '%s: %s' % (scchar, scto)
 
     def colnames(self):
         return [d[0] for d in curs.description]
@@ -649,7 +649,9 @@
     def do_compare(self, args):
         """COMPARE query1 TO query2 - uses external tool to display differences.
     
-        Sorting is recommended to avoid false hits."""
+        Sorting is recommended to avoid false hits.
+        Will attempt to use a graphical diff/merge tool like kdiff3, meld, or Araxis Merge, 
+        if they are installed."""
         fnames = []
         args2 = args.split(' to ')
         for n in range(len(args2)):