mergetools / gvimdiff2on commit Merge branch 'js/clone-dissociate' into maint (f836a32)
   1. "$MERGE_TOOLS_DIR/vimdiff"