mergetools / gvimdiff2on commit Merge branch 'jc/am-3-fallback-regression-fix' into maint (ced2321)
   1. "$MERGE_TOOLS_DIR/vimdiff"