mergetools / vimdiff2on commit Merge branch 'ah/misc-message-fixes' (4fa1251)
   1. "$MERGE_TOOLS_DIR/vimdiff"