diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-07-09 15:09:49 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-07-09 15:09:49 -0400 |
| commit | 7a62581096d328a0403944286125c1bab8be0edc (patch) | |
| tree | 4d06ca8daf7fbdae93d1bae527203c34fd2112e2 | |
| parent | 79de0bb85e576b20117ce867ed76aab74815098d (diff) | |
| parent | bd9578ee30455c7fcce13b61fbff0017ecaf713a (diff) | |
Merge branch 'master' of ssh://git-annex.branchable.com
2 files changed, 16 insertions, 0 deletions
diff --git a/doc/bugs/Assistant_merge_loop/comment_5_11873461f093a266f0bb7e129bc21cde._comment b/doc/bugs/Assistant_merge_loop/comment_5_11873461f093a266f0bb7e129bc21cde._comment new file mode 100644 index 000000000..188317bb8 --- /dev/null +++ b/doc/bugs/Assistant_merge_loop/comment_5_11873461f093a266f0bb7e129bc21cde._comment @@ -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. +"""]] 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. +"""]] |