summaryrefslogtreecommitdiff
path: root/doc/news/version_5.20140709.mdwn
diff options
context:
space:
mode:
Diffstat (limited to 'doc/news/version_5.20140709.mdwn')
-rw-r--r--doc/news/version_5.20140709.mdwn11
1 files changed, 0 insertions, 11 deletions
diff --git a/doc/news/version_5.20140709.mdwn b/doc/news/version_5.20140709.mdwn
deleted file mode 100644
index e7609949f..000000000
--- a/doc/news/version_5.20140709.mdwn
+++ /dev/null
@@ -1,11 +0,0 @@
-git-annex 5.20140709 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
- * Fix race in direct mode merge code that could cause all files in the
- repository to be removed. It should be able to recover repositories
- experiencing this bug without data loss. See:
- http://git-annex.branchable.com/bugs/bad\_merge\_commit\_deleting\_all\_files/
- * Fix git version that supported --no-gpg-sign.
- * Fix bug in automatic merge conflict resolution, when one side is an
- annexed symlink, and the other side is a non-annexed symlink.
- * Really fix bug that caused the assistant to make many unncessary
- empty merge commits."""]]