git-annex/doc/design/assistant/blog/day_18__merging
..
comment_1_7a553ad559519f3b3e3cd20115b4c44e._comment