mergetools / gvimdiff2on commit Merge branch 'nd/worktree-lock' (166251c)
   1. "$MERGE_TOOLS_DIR/vimdiff"