sync: When there are merge conflicts that get automatically resolved, exit nonzero at the end.
This commit is contained in:
parent
365ecb6c2d
commit
4f373503f2
3 changed files with 13 additions and 1 deletions
2
debian/changelog
vendored
2
debian/changelog
vendored
|
@ -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
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue