mergetools / gvimdiffon commit Merge branch 'rj/commit-slab-fix' (2ed8eca)
   1. "$MERGE_TOOLS_DIR/vimdiff"