summaryrefslogtreecommitdiff
path: root/git-union-merge.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-06-20 22:21:02 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-06-20 22:21:02 -0400
commita9a464914887b953d216fc2af8c691b0ee9b61d7 (patch)
tree76baac9fa64473c889f415cc007cb57370c0b4e8 /git-union-merge.hs
parent8b749d4bfdc81155e0dc17026f1575620bc132e1 (diff)
typo
Diffstat (limited to 'git-union-merge.hs')
-rw-r--r--git-union-merge.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-union-merge.hs b/git-union-merge.hs
index 2a2570cf4..e11f93701 100644
--- a/git-union-merge.hs
+++ b/git-union-merge.hs
@@ -19,7 +19,7 @@ import qualified GitRepo as Git
import Utility
header :: String
-header = "Usage: git-union-merge newref ref ref"
+header = "Usage: git-union-merge ref ref newref"
usage :: IO a
usage = error $ "bad parameters\n\n" ++ header