From f3539810a43863171f4f0d99885c6b306eb79c61 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 14 Nov 2013 14:36:48 -0400 Subject: on second thought, don't change sync to exit nonzero on successful conflicted merge resolution For one thing, that breaks the test suite. May revisit later. --- debian/changelog | 2 -- 1 file changed, 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e316b5e1a..975818366 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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. -- cgit v1.2.3