diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-06-23 10:22:56 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-06-23 10:22:56 -0400 |
| commit | c79e3b67e9e55817992d2d0c72fd6f01a6a403ec (patch) | |
| tree | 3632838125b3e624ed2fb222f64bc0251dfee26e /debian/changelog | |
| parent | 3118eeb63fbd5ae6565c49c1e8d14f61b6f8f810 (diff) | |
sync: Avoid recent git's interactive merge.
Diffstat (limited to 'debian/changelog')
| -rw-r--r-- | debian/changelog | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 5d8d973c6..a580f88bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ git-annex (3.20120616) UNRELEASED; urgency=low Available on Linux, BSDs, and OSX! * Enable diskfree on kfreebsd, using kqueue. * unused: Fix crash when key names contain invalid utf8. + * sync: Avoid recent git's interactive merge. -- Joey Hess <joeyh@debian.org> Tue, 12 Jun 2012 11:35:59 -0400 |