diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-10-16 14:48:51 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-10-16 14:56:40 -0400 |
| commit | a40e203f23a87bbc6d362d33734f1e4dcf645871 (patch) | |
| tree | 5c68f1b7c21f2c67368704be0a253b816cb37074 /debian | |
| parent | 1a5c87f05e890782b8fcd922b608f177ed7d54bc (diff) | |
sync: Fix automatic resolution of merge conflicts where one side is an annexed file, and the other side is a non-annexed file, or a directory.
Note that this case is only fully automatically resolved in direct mode.
In indirect mode, git merge moves the file to file~HEAD, and replaces it
with the directory, and leaves the file in unmerged state, and sync doesn't
yet change that.
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 d2234d810..67aae5e2c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,8 @@ git-annex (4.20131003) UNRELEASED; urgency=low * Deal with git check-attr -z output format change in git 1.8.5. * Work around sed output difference that led to version containing a newline on OSX. + * sync: Fix automatic resolution of merge conflicts where one side is an + annexed file, and the other side is a non-annexed file, or a directory. -- Joey Hess <joeyh@debian.org> Thu, 03 Oct 2013 15:41:24 -0400 |