summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar http://joeyh.name/ <http://joeyh.name/@web>2014-07-07 17:19:03 +0000
committerGravatar admin <admin@branchable.com>2014-07-07 17:19:03 +0000
commita912531736eb37ce48b860220489be894de61b33 (patch)
tree64c4ef45a3823627be716f2989a198307787bbbf
parentf604296a6e9c62755053d4645420653c3268c5f5 (diff)
Added a comment
-rw-r--r--doc/bugs/Merge_involving_symlink_yields_unexpected_results/comment_3_c6ca13d475b3f846c95606c20e1a3052._comment8
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/bugs/Merge_involving_symlink_yields_unexpected_results/comment_3_c6ca13d475b3f846c95606c20e1a3052._comment b/doc/bugs/Merge_involving_symlink_yields_unexpected_results/comment_3_c6ca13d475b3f846c95606c20e1a3052._comment
new file mode 100644
index 000000000..292d11743
--- /dev/null
+++ b/doc/bugs/Merge_involving_symlink_yields_unexpected_results/comment_3_c6ca13d475b3f846c95606c20e1a3052._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.55"
+ subject="comment 3"
+ date="2014-07-07T17:19:03Z"
+ content="""
+Ah, I see, it's explicitly because the non-git-annex symlink is involved. Whew!
+"""]]