mergetools / vimdiff2on commit Merge branch 'jk/long-paths' into maint-2.2 (f54cb05)
   1. "$MERGE_TOOLS_DIR/vimdiff"