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 /merge-recursive.c | |
| 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 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions