Merge branch 'nd/diff-flush-before-warning' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 22 Mar 2018 21:24:09 +0000 (14:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 22 Mar 2018 21:24:09 +0000 (14:24 -0700)
commitb32221935e82d74d653212339442606d98aa7594
tree00ae4ab4af1cfd85abbda3ea80abfedb428a6365
parent573ce039f3147d381c81201070ae48b8651e7dda
parent4e056c989f8642050973ba1aabc687979f41798c
Merge branch 'nd/diff-flush-before-warning' into maint

Avoid showing a warning message in the middle of a line of "git
diff" output.

* nd/diff-flush-before-warning:
  diff.c: flush stdout before printing rename warnings
diff.c