git-annex/Assistant/Threads
Joey Hess fb51d99951 merge conflict resolution now working
Avoid MVar deadlock issue, which I don't understand.
Have not taken the time to debug it fully, because it turns out I don't
need to resolve merge conflicts when a new branch ref is written... I
think.

Ensure the git-annex branch is merged when doing a manual pull.
Otherwise it can get out of sync, since git-annex normally only merges it
once per run.
2012-06-27 20:50:50 -04:00
..
Committer.hs reorg threads 2012-06-25 16:10:24 -04:00
Merger.hs merge conflict resolution now working 2012-06-27 20:50:50 -04:00
Pusher.hs use a TMVar 2012-06-26 19:21:44 -04:00
SanityChecker.hs reorg threads 2012-06-25 16:10:24 -04:00
Watcher.hs reorg threads 2012-06-25 16:10:24 -04:00