summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar http://joeyh.name/ <http://joeyh.name/@web>2014-07-09 19:01:33 +0000
committerGravatar admin <admin@branchable.com>2014-07-09 19:01:33 +0000
commitbd9578ee30455c7fcce13b61fbff0017ecaf713a (patch)
treef5db2e7c2ee4e4bcd4b9c1f8a9dde2838f8aec61
parented3c5c7f82d1a309d120921554c819c334069fb9 (diff)
Added a comment
-rw-r--r--doc/bugs/bad_merge_commit_deleting_all_files/comment_6_c532859deb682dff9e59037d08f66a51._comment8
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/bugs/bad_merge_commit_deleting_all_files/comment_6_c532859deb682dff9e59037d08f66a51._comment b/doc/bugs/bad_merge_commit_deleting_all_files/comment_6_c532859deb682dff9e59037d08f66a51._comment
new file mode 100644
index 000000000..b1a5d32a6
--- /dev/null
+++ b/doc/bugs/bad_merge_commit_deleting_all_files/comment_6_c532859deb682dff9e59037d08f66a51._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.55"
+ subject="comment 6"
+ date="2014-07-09T19:01:33Z"
+ content="""
+Note that [[Assistant_merge_loop]], which contributes to this bug, is not actually fixed in 5.20140707, it seems.
+"""]]