reinject: Add a sanity check for using an annexed file as the source file.

This commit is contained in:
Joey Hess 2011-12-12 13:43:52 -04:00
parent 79345ad5fc
commit 6edaabd040
2 changed files with 4 additions and 2 deletions

1
debian/changelog vendored
View file

@ -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