diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-02-16 14:45:13 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-02-16 14:45:13 -0800 |
| commit | e048a257bfe66e6eead5e212b5449ffd108de707 (patch) | |
| tree | e28774ab8bf3d8d49004b13c27ad652cce9d60d5 /builtin/merge-recursive.c | |
| parent | Merge branch 'rs/strbuf-cleanup-in-rmdir-recursively' (diff) | |
| parent | mingw: make stderr unbuffered again (diff) | |
| download | tgif-e048a257bfe66e6eead5e212b5449ffd108de707.tar.xz | |
Merge branch 'js/mingw-isatty'
A hotfix for a topic already in 'master'.
* js/mingw-isatty:
mingw: make stderr unbuffered again
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions