mergetools / vimdiff2on commit push: switch default from "matching" to "simple" (11037ee)
   1. "$MERGE_TOOLS_DIR/vimdiff"