mergetools / gvimdiff2on commit Merge branch 'maint-1.8.1' into maint (7f20008)
   1. "$MERGE_TOOLS_DIR/vimdiff"