summaryrefslogtreecommitdiff
path: root/Assistant/Threads/Merger.hs
Commit message (Expand)AuthorAge
* handle case of adding populated drive to just created repoGravatar Joey Hess2012-08-05
* build fixesGravatar Joey Hess2012-07-25
* debugging improvementsGravatar Joey Hess2012-07-20
* MVar deadlock problem seems to be fixed by previous commitGravatar Joey Hess2012-06-28
* improve thread termination handlingGravatar Joey Hess2012-06-28
* tweakGravatar Joey Hess2012-06-28
* merge conflict resolution now workingGravatar Joey Hess2012-06-27
* actually fetch from remote when doing a manual pullGravatar Joey Hess2012-06-27
* automatic conflict resolution for assistantGravatar Joey Hess2012-06-27
* fixup merges now done when neededGravatar Joey Hess2012-06-25
* reorg threadsGravatar Joey Hess2012-06-25