diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-07-11 16:45:18 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-07-11 16:45:18 -0400 |
| commit | 2a727e8c5f8d003af7102ea7de22e45a5faec421 (patch) | |
| tree | 661d008aeb7f13c873c9afb7dcfa360aed60a528 /debian | |
| parent | 64b74f4c616bd1aa42e7833b449586b64dac1ba5 (diff) | |
resolvemerge: New plumbing command that runs the automatic merge conflict resolver.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 6aa0fa5f3..39642b575 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ git-annex (5.20140710) UNRELEASED; urgency=medium * S3: Deal with AWS ACL configurations that do not allow creating or checking the location of a bucket, but only reading and writing content to it. + * resolvemerge: New plumbing command that runs the automatic merge conflict + resolver. -- Joey Hess <joeyh@debian.org> Wed, 09 Jul 2014 23:29:21 -0400 |