diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-11-27 11:06:34 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-27 11:06:34 +0900 |
| commit | c5e763083fa675629c7d936d72fb67d8f03e0846 (patch) | |
| tree | e1e4bf68f99850e8bf10ee5fccbbf20bb341a68b /builtin | |
| parent | dec01eee45f4275f1b9115947452cbd0964a661a (diff) | |
| parent | 89b9e31dd56705af01da2a1a3dc2d466172cb016 (diff) | |
| download | git-c5e763083fa675629c7d936d72fb67d8f03e0846.tar.gz git-c5e763083fa675629c7d936d72fb67d8f03e0846.tar.xz | |
Merge branch 'tz/notes-error-to-stderr'
"git notes" sent its error message to its standard output stream,
which was corrected.
* tz/notes-error-to-stderr:
notes: send "Automatic notes merge failed" messages to stderr
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/notes.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/builtin/notes.c b/builtin/notes.c index d7754db14..a2a542f82 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -865,10 +865,10 @@ static int merge(int argc, const char **argv, const char *prefix) if (create_symref("NOTES_MERGE_REF", default_notes_ref(), NULL)) die(_("failed to store link to current notes ref (%s)"), default_notes_ref()); - printf(_("Automatic notes merge failed. Fix conflicts in %s and " - "commit the result with 'git notes merge --commit', or " - "abort the merge with 'git notes merge --abort'.\n"), - git_path(NOTES_MERGE_WORKTREE)); + fprintf(stderr, _("Automatic notes merge failed. Fix conflicts in %s " + "and commit the result with 'git notes merge --commit', " + "or abort the merge with 'git notes merge --abort'.\n"), + git_path(NOTES_MERGE_WORKTREE)); } free_notes(t); |