aboutsummaryrefslogtreecommitdiff
path: root/Opts.hs
diff options
context:
space:
mode:
Diffstat (limited to 'Opts.hs')
-rw-r--r--Opts.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Opts.hs b/Opts.hs
index 1901c53..761bda0 100644
--- a/Opts.hs
+++ b/Opts.hs
@@ -188,10 +188,10 @@ cmd =
$ mconcat
[ command "merge"
$ info cmdDiff3
- $ progDesc "diff3-style merge of changes"
+ $ progDesc "diff3-style merge of two changesets"
, command "git"
$ info cmdGitMerge
- $ progDesc "try to merge unmerged git tree"
+ $ progDesc "automerge unmerged files in git conflict"
]
parseOpts :: IO (Config, Command)