mergetools / gvimdiff2on commit Merge branch 'nd/clone-local-with-colon' (cabb411)
   1. "$MERGE_TOOLS_DIR/vimdiff"