Index: tools/client-side/mergeinfo-sanitizer.py
===================================================================
--- tools/client-side/mergeinfo-sanitizer.py	(revision 1180546)
+++ tools/client-side/mergeinfo-sanitizer.py	(working copy)
@@ -6,7 +6,6 @@
 import hashlib
 import pickle
 import getpass
-import re
 from svn import client, core, ra, wc
 
 ## This script first fetches the mergeinfo of the working copy and tries
@@ -23,7 +22,7 @@
 mergeinfo = {}
 
 def usage():
-  sys.stderr.write(""" Usage: %s WCPATH
+  sys.stderr.write(""" Usage: %s WCPATH [OPTION]
 
 Analyze the mergeinfo property of the given WCPATH.
 Look for the existence of merge_source's locations at their recorded