--- a/mercurial/commands.py	Tue Jun 15 09:51:52 2010 +0200
+++ b/mercurial/commands.py	Tue Jun 15 09:53:50 2010 +0200
@@ -889,10 +889,10 @@
     """
 
     if not (mergeable_file or appended_file or overwritten_file or new_file):
-        raise Exception(_('need at least one of -m, -a, -o, -n'))
+        raise util.Abort(_('need at least one of -m, -a, -o, -n'))
 
     if len(repo.changelog) > 0:
-        raise Exception(_('repository is not empty'))
+        raise util.Abort(_('repository is not empty'))
 
     if overwritten_file or appended_file:
         # we don't want to fail in merges during buildup