[[!comment format=mdwn
 username="http://joeyh.name/"
 ip="209.250.56.102"
 subject="comment 3"
 date="2014-03-20T16:10:10Z"
 content="""
@Matthias `git annex merge` will do what you want, as long as you have git-annex 4.20130709 or newer.
"""]]