diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-07-07 13:31:22 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-07-07 13:31:22 -0400 |
| commit | 325a0cf7fee0846e4c7e2fee0a9367b1d786ac87 (patch) | |
| tree | 9d74542e4c7a6d74a332088efa079a3622e10cbd | |
| parent | 232c7d2f21dc522ae9e859244c55863070c74bed (diff) | |
| parent | a912531736eb37ce48b860220489be894de61b33 (diff) | |
Merge branch 'master' of ssh://git-annex.branchable.com
2 files changed, 16 insertions, 0 deletions
diff --git a/doc/bugs/Merge_involving_symlink_yields_unexpected_results/comment_2_b6182038292bd72dc4711e4575510172._comment b/doc/bugs/Merge_involving_symlink_yields_unexpected_results/comment_2_b6182038292bd72dc4711e4575510172._comment new file mode 100644 index 000000000..39f60f775 --- /dev/null +++ b/doc/bugs/Merge_involving_symlink_yields_unexpected_results/comment_2_b6182038292bd72dc4711e4575510172._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="209.250.56.55" + subject="comment 2" + date="2014-07-07T17:17:49Z" + content=""" +Drat, so many bug fixes and test cases and this still got through? +"""]] 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! +"""]] |