mergetools / vimdiff3on commit Merge branch 'lr/git-run-setup-gently' (22e91ba)
   1. "$MERGE_TOOLS_DIR/vimdiff"