mergetools / gvimdiffon commit Merge branch 'cc/shared-index-permfix' (8e90578)
   1. "$MERGE_TOOLS_DIR/vimdiff"