summaryrefslogtreecommitdiff
path: root/doc/sync/comment_14_378459d9718bd36560a9a4572d587979._comment
blob: 182e935adb8657cf49873cdd6b20d22417de41dd (plain)
1
2
3
4
5
6
7
8
[[!comment format=mdwn
 username="zardoz"
 ip="134.147.14.84"
 subject="comment 14"
 date="2014-05-15T08:57:33Z"
 content="""
Added a wishlist item <http://git-annex.branchable.com/todo/Expose_auto-merge_for_manual__44___local_merges/>.
"""]]