The changes we suggested in our previous paper suffered from the common complaints of a retrofit in that they did not sit comfortably with the original and only did half a job. The prevalence of GUIs also suggest that the actual syntax of a diff file is not as important as it was in that the emphasis has changed from human readability to interchange between two applications, for example between a git ‘merge driver’ and a git ‘mergetool’. For these reasons it seemed better to consider a different approach using the tools and formats that are now in common use, for example XML or JSON.
What might diff3 look like as an XML format? Would the advantages of a new format make it worth swapping from the tried and tested diff3? Could existing GUI software easily adapt to a new format and perhaps, even be simpler as a result?