From f97904f947cf98ce94f32600f80deb3492d6e834 Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Thu, 20 Mar 2014 16:10:11 +0000 Subject: [PATCH] Added a comment --- .../comment_3_5c587c6633cae1c8547ca970d55ee97e._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/automatic_conflict_resolution/comment_3_5c587c6633cae1c8547ca970d55ee97e._comment diff --git a/doc/automatic_conflict_resolution/comment_3_5c587c6633cae1c8547ca970d55ee97e._comment b/doc/automatic_conflict_resolution/comment_3_5c587c6633cae1c8547ca970d55ee97e._comment new file mode 100644 index 0000000000..58bdc56310 --- /dev/null +++ b/doc/automatic_conflict_resolution/comment_3_5c587c6633cae1c8547ca970d55ee97e._comment @@ -0,0 +1,8 @@ +[[!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. +"""]]