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 /git-mergetool.sh | |
| parent | Merge branch 'tz/redirect-fix' (diff) | |
| parent | notes: send "Automatic notes merge failed" messages to stderr (diff) | |
| download | tgif-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 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions