diff options
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 73dd55ffb..92e121314 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,8 @@ git-annex (5.20140228) UNRELEASED; urgency=medium * metadata: To only set a field when it's not already got a value, use -s field?=value * Run .git/hooks/pre-commit-annex whenever a commit is made. + * sync: Automatically resolve merge conflict between and annexed file + and a regular git file. -- Joey Hess <joeyh@debian.org> Fri, 28 Feb 2014 14:52:15 -0400 |