mergetools / gvimdiffon commit remote-helpers: trivial style fixes (670dda8)
   1. "$MERGE_TOOLS_DIR/vimdiff"