mergetools / gvimdiff2on commit Merge branch 'jc/fsck-retire-require-eoh' into maint (bde6a72)
   1. "$MERGE_TOOLS_DIR/vimdiff"