From 467d576560c4a981eaa55f71687b8228c9ea5017 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg"
 <Tim@web>
Date: Thu, 14 Nov 2013 16:18:42 +0000
Subject: [PATCH]

---
 doc/bugs/Incorrect_merge___40__a_special_case__41__.mdwn | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/doc/bugs/Incorrect_merge___40__a_special_case__41__.mdwn b/doc/bugs/Incorrect_merge___40__a_special_case__41__.mdwn
index 987d8a8fc0..db9a649591 100644
--- a/doc/bugs/Incorrect_merge___40__a_special_case__41__.mdwn
+++ b/doc/bugs/Incorrect_merge___40__a_special_case__41__.mdwn
@@ -4,11 +4,13 @@ Minor issue.
 Incorrect merge of direct repos in the special case where at repo A a symlink to a file whose contents aren't yet available, are overwritten, while at repo B the file is deleted.
 
 Result: file is deleted on both side.
+
 Expected: B.f is gone, A.f is still present
 
 ### What steps will reproduce the problem?
 
-// setting up stuff
+[[!format sh """
+# setting up stuff
 test/a$ git init
 test/a$ git annex init
 test/a$ git annex direct
@@ -18,7 +20,7 @@ $ git clone test/a
 $ mv a test/b
 test/b$ git annex direct
 
-// actual scenario
+# actual scenario
 test/b$ echo bbbb > f
 test/b$ git annex add f
 test/b$ git annex sync
@@ -29,7 +31,8 @@ test/a$ git annex sync
 test/b$ rm f
 test/b$ git annex sync
 test/a$ git annex sync
-// test/a/f is now gone, lost
+# test/a/f is now gone, lost
+"""]]
 
 ### What version of git-annex are you using? On what operating system?
 git-annex version: 4.20131031-g7d99d14