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

format comment

Browse source
This commit is contained in:
Joey Hess 2013-12-12 15:16:44 -04:00
parent 13f7e51724
commit c160bf9d88
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Annex/Direct.hs
View file

@ -162,9 +162,9 @@ mergeDirect d branch g = do
- There are really only two types of changes: An old item can be deleted, - There are really only two types of changes: An old item can be deleted,
- or a new item added. Two passes are made, first deleting and then - or a new item added. Two passes are made, first deleting and then
- adding. This is to handle cases where eg, a file is deleted and a - adding. This is to handle cases where eg, a file is deleted and a
- directory is added. The diff-tree output may list these in the opposite - directory is added. (The diff-tree output may list these in the opposite
- order, but we cannot really add the directory until the file with the - order, but we cannot add the directory until the file with the
- same name is remvoed. - same name is removed.)
-} -}
mergeDirectCleanup :: FilePath -> Git.Ref -> Git.Ref -> Annex () mergeDirectCleanup :: FilePath -> Git.Ref -> Git.Ref -> Annex ()
mergeDirectCleanup d oldsha newsha = do mergeDirectCleanup d oldsha newsha = do