From: Junio C Hamano <hidden> Date: 2016-06-15 22:50:00
Erik Faye-Lund [off-list ref] writes:
I supposed the correct conflict-resolution would be to keep Markus'
new conditional inclusion, but move it to the location I changed it
to. With this patch on top it compiles just fine for me: