mergetools / gvimdiff2on commit Merge branch 'dm/ni-maxhost-may-be-missing' (31ccd35)
   1. "$MERGE_TOOLS_DIR/vimdiff"