mergetools / gvimdiffon commit Merge branch 'mm/makefile-developer-can-be-in-config-mak' (ec5ad66)
   1. "$MERGE_TOOLS_DIR/vimdiff"