mergetools / gvimdiffon commit Merge branch 'rs/simple-cleanups' (8a6444d)
   1. "$MERGE_TOOLS_DIR/vimdiff"