mergetools / gvimdiffon commit diff: avoid some nesting (aad90e8)
   1. "$MERGE_TOOLS_DIR/vimdiff"