summaryrefslogtreecommitdiff
path: root/Assistant/Threads/Merger.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-04-30 15:59:11 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-04-30 16:01:25 -0400
commitbaec0e627d5ea31131729274415041c01de2bcf0 (patch)
tree6eded2dae6870beb4dbd341cdd2877d1c26ee8ea /Assistant/Threads/Merger.hs
parentb8e0db34d877a5e209708a3f266ed3fe96343b1a (diff)
update changelog
Note that the note on d12b1fb179bc1744f813ea3f616d503d2b0dfe09 turned out to be wrong. Multiple repository pairing over XMPP does work, because the annex-uuid of the xmpp remote is updated to the uuid of the new repo when pairing takes place. So the push from it is accepted. (And the other UUIDs are listed in uuid.log, so pushes from those repositories also are accepted of course.)
Diffstat (limited to 'Assistant/Threads/Merger.hs')
0 files changed, 0 insertions, 0 deletions