random hlint (to give the autobuilder something new to build)
This commit is contained in:
parent
b914620264
commit
2d480602aa
6 changed files with 12 additions and 14 deletions
|
@ -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. -}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue