diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-06-28 13:04:02 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-06-28 13:04:02 -0400 |
| commit | 40f357fdcf07a9b9844e675fe478ab08f5c1bae8 (patch) | |
| tree | e821fcded23ff6e65dbbdd64d3439fd0c3adbfe4 | |
| parent | fb51d9995193b2e15f3e5174783347ec14dbaa28 (diff) | |
tweak
| -rw-r--r-- | Assistant.hs | 2 | ||||
| -rw-r--r-- | Assistant/Threads/Merger.hs | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/Assistant.hs b/Assistant.hs index 4f8a868f4..b61270613 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 d643f1694..de172e8da 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 () |