From 40f357fdcf07a9b9844e675fe478ab08f5c1bae8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 28 Jun 2012 13:04:02 -0400 Subject: [PATCH] tweak --- Assistant.hs | 2 +- Assistant/Threads/Merger.hs | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Assistant.hs b/Assistant.hs index 4f8a868f4f..b61270613c 100644 --- a/Assistant.hs +++ b/Assistant.hs @@ -40,7 +40,7 @@ - - ThreadState: (MVar) - The Annex state is stored here, which allows resuscitating the - - Annex monad in IO actions run by the inotify and committer + - Annex monad in IO actions run by the watcher and committer - threads. Thus, a single state is shared amoung the threads, and - only one at a time can access it. - DaemonStatusHandle: (MVar) diff --git a/Assistant/Threads/Merger.hs b/Assistant/Threads/Merger.hs index d643f16943..de172e8da0 100644 --- a/Assistant/Threads/Merger.hs +++ b/Assistant/Threads/Merger.hs @@ -36,7 +36,6 @@ mergeThread st = do , errHook = hook onErr } watchDir dir (const False) hooks id - where type Handler = Git.Repo -> FilePath -> Maybe FileStatus -> IO ()