summaryrefslogtreecommitdiff
path: root/doc/sync
diff options
context:
space:
mode:
Diffstat (limited to 'doc/sync')
-rw-r--r--doc/sync/comment_14_378459d9718bd36560a9a4572d587979._comment8
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/sync/comment_14_378459d9718bd36560a9a4572d587979._comment b/doc/sync/comment_14_378459d9718bd36560a9a4572d587979._comment
new file mode 100644
index 000000000..182e935ad
--- /dev/null
+++ b/doc/sync/comment_14_378459d9718bd36560a9a4572d587979._comment
@@ -0,0 +1,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/>.
+"""]]