mergetools / gvimdiff2on commit reset test: modernize style (95728f7)
   1. "$MERGE_TOOLS_DIR/vimdiff"