mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

doh't use "def" for command definitions, it conflicts with Data.Default.def

Browse source
This commit is contained in:
Joey Hess 2014-10-14 14:20:10 -04:00
parent db9121ecee
commit 59f88558d5
86 changed files with 267 additions and 267 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Command/ResolveMerge.hs
View file

@ -14,8 +14,8 @@ import Git.Sha
import qualified Git.Branch
import Annex.AutoMerge
def :: [Command]
def = [command "resolvemerge" paramNothing seek SectionPlumbing
cmd :: [Command]
cmd = [command "resolvemerge" paramNothing seek SectionPlumbing
"resolve merge conflicts"]
seek :: CommandSeek