Thanks for the test data. I installed a Gnulib patch, noted here:

http://lists.gnu.org/archive/html/bug-gnulib/2016-10/msg00157.html

along with the attached diffutils patches. This fixed the problem for me, so I 
am closing the bug report.