diff options
| author | Mirek Kratochvil <miroslav.kratochvil@uni.lu> | 2025-07-23 10:50:17 +0200 |
|---|---|---|
| committer | Mirek Kratochvil <miroslav.kratochvil@uni.lu> | 2025-07-23 10:50:17 +0200 |
| commit | b52b106ac50a0100e41843e2bd2edcbb74a10b6e (patch) | |
| tree | 5eafe6ff4c01506af70ca11477f29aa8d70c9c1d /Opts.hs | |
| parent | 259ad6101b71e764459171122a3915ace74f6590 (diff) | |
| download | werge-b52b106ac50a0100e41843e2bd2edcbb74a10b6e.tar.gz werge-b52b106ac50a0100e41843e2bd2edcbb74a10b6e.tar.bz2 | |
allow picking patches from files
Diffstat (limited to 'Opts.hs')
| -rw-r--r-- | Opts.hs | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -230,6 +230,7 @@ data Command } | CmdPatch { patchMy :: FilePath + , patchInput :: Maybe FilePath } | CmdBreak | CmdGlue @@ -295,6 +296,12 @@ cmdDiff = do cmdPatch :: Parser Command cmdPatch = do patchMy <- strArgument $ metavar "MYFILE" <> help "File to be modified" + patchInput <- + optional . strOption + $ long "patch" + <> short 'p' + <> metavar "PATCH" + <> help "File with the patch (default: stdin)" pure CmdPatch {..} -- TODO have some option to output the (partially merged) my/old/your files so @@ -314,7 +321,7 @@ cmd = $ progDesc "Find differences between two files" , command "patch" $ info cmdPatch - $ progDesc "Apply a patch from `diff' to file" + $ progDesc "Modify a file using a patch from `diff'" , command "break" $ info (pure CmdBreak) $ progDesc "Break text to tokens" |
