mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' of ssh://git-annex.branchable.com

Browse source
This commit is contained in:
Joey Hess 2014-07-07 13:31:22 -04:00
commit 8116d10b8f
2 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
doc/bugs/Merge_involving_symlink_yields_unexpected_results/comment_2_b6182038292bd72dc4711e4575510172._comment Normal file
View file

@ -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?
"""]]

8
doc/bugs/Merge_involving_symlink_yields_unexpected_results/comment_3_c6ca13d475b3f846c95606c20e1a3052._comment Normal file
View file

@ -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!
"""]]