Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge: support config diff.algorithm and merge.conflictStyle and merge-file command #10

Merged
merged 2 commits into from
Dec 18, 2024

Conversation

fcharlie
Copy link
Collaborator

No description provided.

@fcharlie fcharlie merged commit c77bf09 into master Dec 18, 2024
6 checks passed
@fcharlie fcharlie deleted the merge-algo branch December 18, 2024 06:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant