mergetools / vimdiff3on commit Merge branch 'jk/misc-fixes-maint' (ad524f8)
   1. "$MERGE_TOOLS_DIR/vimdiff"