diff options
| author | Mirek Kratochvil <exa.exa@gmail.com> | 2025-07-13 22:30:41 +0200 |
|---|---|---|
| committer | Mirek Kratochvil <exa.exa@gmail.com> | 2025-07-13 22:30:41 +0200 |
| commit | 396e5cff54d23a035aa3b7c199ee609b7f7bda65 (patch) | |
| tree | 102e318b5d15e16579f1218c504f6ed6c4cde841 /Opts.hs | |
| parent | 60a08808b920e938418dead74f55ae48b2f0f9c2 (diff) | |
| download | werge-396e5cff54d23a035aa3b7c199ee609b7f7bda65.tar.gz werge-396e5cff54d23a035aa3b7c199ee609b7f7bda65.tar.bz2 | |
readme skeleton
Diffstat (limited to 'Opts.hs')
| -rw-r--r-- | Opts.hs | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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) |