From 6668fe0ca201fb28311ca10300afc06136d38211 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 17 Oct 2013 15:11:21 -0400 Subject: update for DiffTree type change (which fixes assistant in subdir confusion bug) --- debian/changelog | 3 +++ 1 file changed, 3 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 1a7b5f1ab..e124c71d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,9 @@ git-annex (4.20131003) UNRELEASED; urgency=low * sync: Fix automatic resolution of merge conflicts where one side is an annexed file, and the other side is a non-annexed file, or a directory. * S3: Try to ensure bucket name is valid for archive.org. + * assistant: Bug fix: When run in a subdirectory, files from incoming merges + were wrongly added to that subdirectory, and removed from their original + locations. -- Joey Hess Thu, 03 Oct 2013 15:41:24 -0400 -- cgit v1.2.3