summaryrefslogtreecommitdiff
path: root/Command/Merge.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-09-14 13:32:46 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-09-14 13:32:46 -0400
commit1ac6217c74b63b9b154d5ee14ed72df8b5aa9268 (patch)
tree35b1bf9eb5262ee494279855265032370dea70fb /Command/Merge.hs
parente296da4bfef21c55fc23376300becb17a08eea83 (diff)
shorten synopsis
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 04328e8c5..faaef906b 100644
--- a/Command/Merge.hs
+++ b/Command/Merge.hs
@@ -13,7 +13,7 @@ import Messages
command :: [Command]
command = [repoCommand "merge" paramNothing seek
- "auto-merges remote changes into the git-annex branch"]
+ "auto-merge remote changes into git-annex branch"]
seek :: [CommandSeek]
seek = [withNothing start]