diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-06-13 14:18:22 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-06-13 14:18:22 -0400 |
| commit | e45dc368733dbce902e35f0e77ce20e687f98280 (patch) | |
| tree | c88657c2576947a3f03687cc67c7536a029d0bcf /CHANGELOG | |
| parent | 45279bc31bad704223c1c552e811186411b7c651 (diff) | |
v6: Fix bad merge in an adjusted branch that resulted in an empty tree.
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -22,6 +22,7 @@ git-annex (6.20160528) UNRELEASED; urgency=medium drop content from disk before writing location log. * v6: Fix bad automatic merge conflict resolution between an annexed file and a directory with the same name when in an adjusted branch. + * v6: Fix bad merge in an adjusted branch that resulted in an empty tree. * Avoid a crash if getpwuid does not work, when querying the user's full name. * v6: Fix bug in initialization of clone from a repo with an adjusted branch |