mergetools / gvimdiff2on commit Merge branch 'es/worktree-add' (4d9f744)
   1. "$MERGE_TOOLS_DIR/vimdiff"