mergetools / gvimdiff3on commit worktree: make setup of new HEAD distinct from worktree population (7f44e3d)
   1. "$MERGE_TOOLS_DIR/vimdiff"