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

build fixes

Browse source
This commit is contained in:
Joey Hess 2012-07-25 22:04:10 -04:00
parent 32d3cffc4c
commit e6ce54de82
4 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Assistant/Threads/Merger.hs
View file

@ -25,7 +25,7 @@ import qualified Remote
thisThread :: ThreadName
thisThread = "Merger"
{- This thread watches for changes to .git/refs/heads/synced/*,
{- This thread watches for changes to .git/refs/heads/synced/,
- which indicate incoming pushes. It merges those pushes into the
- currently checked out branch. -}
mergeThread :: ThreadState -> IO ()