mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

on second thought, don't change sync to exit nonzero on successful conflicted merge resolution

Browse source 
For one thing, that breaks the test suite. May revisit later.
This commit is contained in:
Joey Hess 2013-11-14 14:36:48 -04:00
parent ac000241b5
commit 2a297dd6d1
3 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
debian/changelog vendored
View file

@ -11,8 +11,6 @@ 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.
* watcher: Avoid loop when adding a file owned by someone else fails
in indirect mode because its permissions cannot be modified.
* webapp: Avoid encoding problems when displaying the daemon log file.