diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-06-27 13:08:32 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-06-27 13:08:32 -0400 |
| commit | 048b64024a14feb0d9ed26abe97c542cfacbc8af (patch) | |
| tree | ff17714706a56f2af7b7ef8f550070344fd6b0ff /debian | |
| parent | 051c68041b5b7a58e7080403e389d0641691edfd (diff) | |
sync: Automatically resolves merge conflicts.
untested, but it compiles :)
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 1 |
1 files changed, 1 insertions, 0 deletions
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 <joeyh@debian.org> Mon, 25 Jun 2012 11:38:12 -0400 |