git-annex/doc/forum/How_to_fix_bad_merge
..
comment_1_4a32a727560ab85203d1dd76feff2e1e._comment