From 048b64024a14feb0d9ed26abe97c542cfacbc8af Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 27 Jun 2012 13:08:32 -0400 Subject: sync: Automatically resolves merge conflicts. untested, but it compiles :) --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c1ebac839..46afb6e4d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ git-annex (3.20120625) UNRELEASED; urgency=low * Accept arbitrarily encoded repository filepaths etc when reading git config output. This fixes support for remotes with unusual characters in their names. + * sync: Automatically resolves merge conflicts. -- Joey Hess Mon, 25 Jun 2012 11:38:12 -0400 -- cgit v1.2.3