mergetools / gvimdiff2on commit add: trivial style cleanup (d521abf)
   1. "$MERGE_TOOLS_DIR/vimdiff"