mergetools / vimdiff3on commit Merge branch 'jc/pull-rebase-ff' into maint (e4ec408)
   1. "$MERGE_TOOLS_DIR/vimdiff"