diff --git a/resolve-trivial-conflicts.cabal b/resolve-trivial-conflicts.cabal
--- a/resolve-trivial-conflicts.cabal
+++ b/resolve-trivial-conflicts.cabal
@@ -2,7 +2,7 @@
 -- further documentation, see http://haskell.org/cabal/users-guide/
 
 name:                resolve-trivial-conflicts
-version:             0.3
+version:             0.3.0.1
 synopsis:            Remove trivial conflict markers in a git repository
 description:         Remove trivial conflict markers in a git repository
 homepage:            https://github.com/ElastiLotem/resolve-trivial-conflicts
diff --git a/resolve_trivial_conflicts.hs b/resolve_trivial_conflicts.hs
--- a/resolve_trivial_conflicts.hs
+++ b/resolve_trivial_conflicts.hs
@@ -165,9 +165,9 @@
     parseArg "-c" = return mempty { shouldUseColor = Just EnableColor }
     parseArg "-C" = return mempty { shouldUseColor = Just DisableColor }
     parseArg "-s" = return mempty { shouldSetConflictStyle = True }
-    parseArg _ =
+    parseArg arg =
       do  prog <- getProgName
-          fail $ unlines
+          putStr $ unlines
             [ "Usage: " ++ prog ++ " [-e] [-d] [-c] [-C] [-s]"
             , ""
             , "-e    Execute $EDITOR for each conflicted file that remains conflicted"
@@ -176,6 +176,7 @@
             , "-C    Disable color"
             , "-s    Configure git's global merge.conflictstyle to diff3 if needed"
             ]
+          fail $ "Unknown argument: " ++ show arg
 
 openEditor :: Options -> FilePath -> IO ()
 openEditor opts path