summaryrefslogtreecommitdiff
path: root/Command/Merge.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-09-15 16:50:49 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-09-15 16:50:49 -0400
commit35145202d2e463569989b710ab5b87f6d9a8fdc1 (patch)
treef418c4c52bd19e5cd7c850526d9bf4a105391776 /Command/Merge.hs
parent456b45b9b3982d9440a43ec014635dee15066f0e (diff)
remove command type definitions
These were a mistake, they make the type signatures harder to read and less flexible. The CommandSeek, CommandStart, CommandPerform, and CommandCleanup types were a good idea, but composing them with the parameters expected is going too far.
Diffstat (limited to 'Command/Merge.hs')
-rw-r--r--Command/Merge.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Command/Merge.hs b/Command/Merge.hs
index faaef906b..832cde512 100644
--- a/Command/Merge.hs
+++ b/Command/Merge.hs
@@ -18,7 +18,7 @@ command = [repoCommand "merge" paramNothing seek
seek :: [CommandSeek]
seek = [withNothing start]
-start :: CommandStartNothing
+start :: CommandStart
start = do
showStart "merge" "."
next perform