mergetools / vimdiff2on commit Merge branch 'maint-1.8.2' into maint (f2b4626)
   1. "$MERGE_TOOLS_DIR/vimdiff"