refs: print error message in debug output

[thirdparty/git.git] / notes-merge.c

diff --git a/notes-merge.c b/notes-merge.c
index 46c1f7c7f11fe221707784be59118b3540839d98..b4a3a903e86f3fdc38064e5f16c63974d2a191e4 100644 (file)
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -273,7 +273,7 @@ static void check_notes_merge_worktree(struct notes_merge_options *o)
                 */
                if (file_exists(git_path(NOTES_MERGE_WORKTREE)) &&
                    !is_empty_dir(git_path(NOTES_MERGE_WORKTREE))) {
-                       if (advice_resolve_conflict)
+                       if (advice_enabled(ADVICE_RESOLVE_CONFLICT))
                                die(_("You have not concluded your previous "
                                    "notes merge (%s exists).\nPlease, use "
                                    "'git notes merge --commit' or 'git notes "