mergetools / gvimdiffon commit Merge branch 'jh/partial-clone' into next (de0f011)
   1. "$MERGE_TOOLS_DIR/vimdiff"