diff options
Diffstat (limited to 'Command/Merge.hs')
| -rw-r--r-- | Command/Merge.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Command/Merge.hs b/Command/Merge.hs index 51a8b9c52..eeb151c27 100644 --- a/Command/Merge.hs +++ b/Command/Merge.hs @@ -13,8 +13,8 @@ import qualified Annex.Branch import qualified Git.Branch import Command.Sync (prepMerge, mergeLocal) -def :: [Command] -def = [command "merge" paramNothing seek SectionMaintenance +cmd :: [Command] +cmd = [command "merge" paramNothing seek SectionMaintenance "automatically merge changes from remotes"] seek :: CommandSeek |