mergetools / gvimdiff3on commit Merge branch 'nd/worktree-add-lock' (e311597)
   1. "$MERGE_TOOLS_DIR/vimdiff"