Commit 18b9ebab6e93f7d3714f10adf4b4f48eec65abd2

Stefan Sperling 2019-10-06T18:44:35

eflag in diff3.c is hard-coded to 3; remove code for other cases