mergetools / gvimdiff2on commit Merge branch 'mg/httpd-tests-update-for-apache-2.4' (bc0ffd4)
   1. "$MERGE_TOOLS_DIR/vimdiff"