mergetools / gvimdiff3on commit Merge branch 'nd/remove-ignore-env-field' into next (802b6ea)
   1. "$MERGE_TOOLS_DIR/vimdiff"