diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-11-07 15:02:11 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-11-07 15:02:11 -0400 |
| commit | 39933fd1b6408e08549af1f9e852bf711ccf4ad8 (patch) | |
| tree | b0cee60f9393c09a89e634ea3e96872a965a6b25 /debian | |
| parent | 7044c30d565dc1555f719bb46848c1316c1f838e (diff) | |
sync: When there are merge conflicts that get automatically resolved, exit nonzero at the end.
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 3682cc3b5..6b50b697f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ git-annex (5.20131102) UNRELEASED; urgency=low "git status" won't work in them. * The -c option now not only modifies the git configuration seen by git-annex, but it is passed along to every git command git-annex runs. + * sync: When there are merge conflicts that get automatically resolved, + exit nonzero at the end. -- Joey Hess <joeyh@debian.org> Sat, 02 Nov 2013 14:54:36 -0400 |