Add a fix to diffmerge to allow diffmerge to be invoked from the
command line. Fixes #5133
Merge pull request #5146 from drew-gross/update-diffmerge

Update diffmerge