From 5175a95f817a5cdd0d643b60be9a5eca6b995534 Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Fri, 1 Nov 2013 15:48:21 +0000 Subject: Added a comment --- .../comment_5_39eb0bb96fd271bd0de4a3a40814ae1b._comment | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 doc/bugs/data_loss:_incorrect_merge_upon_conflicting_directory-file_of_direct_repos/comment_5_39eb0bb96fd271bd0de4a3a40814ae1b._comment diff --git a/doc/bugs/data_loss:_incorrect_merge_upon_conflicting_directory-file_of_direct_repos/comment_5_39eb0bb96fd271bd0de4a3a40814ae1b._comment b/doc/bugs/data_loss:_incorrect_merge_upon_conflicting_directory-file_of_direct_repos/comment_5_39eb0bb96fd271bd0de4a3a40814ae1b._comment new file mode 100644 index 000000000..0e5d67f74 --- /dev/null +++ b/doc/bugs/data_loss:_incorrect_merge_upon_conflicting_directory-file_of_direct_repos/comment_5_39eb0bb96fd271bd0de4a3a40814ae1b._comment @@ -0,0 +1,11 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="209.250.56.47" + subject="comment 5" + date="2013-11-01T15:48:21Z" + content=""" +AFAIK this bug is fixed, which is why I wrote above, \"Bug fixed; test case added; done\" + +If you have reason to think otherwise, better follow up. + +"""]] -- cgit v1.2.3