mergetools / vimdiff2on commit Merge branch 'maint-1.8.1' into maint (5e950c2)
   1. "$MERGE_TOOLS_DIR/vimdiff"