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-09 15:09:49 -04:00
commit d76b5a674f
2 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/bugs/Assistant_merge_loop/comment_5_11873461f093a266f0bb7e129bc21cde._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.55"
subject="comment 5"
date="2014-07-09T19:00:35Z"
content="""
I have confirmed this is still happening, though I had certianly thought I had reproduced and fixed it.
"""]]

8
doc/bugs/bad_merge_commit_deleting_all_files/comment_6_c532859deb682dff9e59037d08f66a51._comment Normal file
View file

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