2 Commits

Author	SHA1	Message	Date
kiloconnect[bot]	05fabd3f1f	chore: mark script/setup-git.ts with kilocode_change marker	2026-05-05 15:11:02 +00:00
kiloconnect[bot]	c239a6bb22	chore(config): enforce zdiff3 conflict style via postinstall ... Add a new setup script to configure `merge.conflictStyle=zdiff3` locally within the repository. This ensures that the common ancestor is visible during merge conflicts, which is required for structural resolution by `mergiraf` and simplifies manual conflict resolution. The configuration is applied during `bun install` via the `postinstall` hook and remains as a fallback for the upstream merge utilities.	2026-05-05 14:49:50 +00:00