From 396e5cff54d23a035aa3b7c199ee609b7f7bda65 Mon Sep 17 00:00:00 2001 From: Mirek Kratochvil Date: Sun, 13 Jul 2025 22:30:41 +0200 Subject: readme skeleton --- Opts.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Opts.hs') 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) -- cgit v1.2.3