aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-12-12 13:43:52 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-12-12 13:43:52 -0400
commit6edaabd0407287becda24904ed19413a5371979c (patch)
treeaa212b82e752651419cf3166b228990a76b44676 /debian
parent79345ad5fc10fc96dcd3599f2e092b3967291549 (diff)
reinject: Add a sanity check for using an annexed file as the source file.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog1
1 files changed, 1 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index db23decbb..5fc01f9ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
git-annex (3.20111212) UNRELEASED; urgency=low
* Union merge now finds the least expensive way to represent the merge.
+ * reinject: Add a sanity check for using an annexed file as the source file.
-- Joey Hess <joeyh@debian.org> Mon, 12 Dec 2011 01:57:49 -0400