summaryrefslogtreecommitdiff
path: root/Annex/Direct.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-02-11 00:39:50 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-02-11 00:41:19 -0400
commit9c77052ce05f449e0951b802a448e9e87756b91e (patch)
tree742b25437297483df8534bcc9d6f90259738393d /Annex/Direct.hs
parent7be93ff4de1b3cb5fb072feb126e02042d58b44b (diff)
random hlint (to give the autobuilder something new to build)
Diffstat (limited to 'Annex/Direct.hs')
-rw-r--r--Annex/Direct.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Annex/Direct.hs b/Annex/Direct.hs
index 340c5c475..495ce0d60 100644
--- a/Annex/Direct.hs
+++ b/Annex/Direct.hs
@@ -184,7 +184,7 @@ mergeDirectCleanup d oldsha newsha = do
tryAnnex . maybe (araw f item) (\k -> void $ a k f)
=<< catKey (getsha item) (getmode item)
- moveout k f = removeDirect k f
+ moveout = removeDirect
{- Files deleted by the merge are removed from the work tree.
- Empty work tree directories are removed, per git behavior. -}