mergetools / vimdiff3on commit Merge branch 'rs/pop-commit' into maint (0af22d6)
   1. "$MERGE_TOOLS_DIR/vimdiff"