Skip to content

Conversation

@brandondong
Copy link
Contributor

PR Description

I hit the same issue as #3119 when setting useExtDiffGitConfig to true and using difftastic side-by-side comparison in my git config.

The same fix in #3120 needs to be applied for the newer config option.

Please check if the PR fulfills these requirements

  • Cheatsheets are up-to-date (run go generate ./...)
  • Code has been formatted (see here)
  • Tests have been added/updated (see here for the integration test guide)
  • Text is internationalised (see here)
  • If a new UserConfig entry was added, make sure it can be hot-reloaded (see here)
  • Docs have been updated if necessary
  • You've read through your own file changes for silly mistakes etc

@stefanhaller stefanhaller added blocks-release Must be addressed before we can cut the next release bug Something isn't working labels Nov 1, 2025
@stefanhaller
Copy link
Collaborator

Thanks, looks good.

@stefanhaller stefanhaller merged commit f4920e8 into jesseduffield:master Nov 1, 2025
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

blocks-release Must be addressed before we can cut the next release bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants