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.

Sign up for GitHub

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

Jump to bottom

Add mergiraf as default merge-driver, difft as default difftool #97

Merged
merged 4 commits into from
Nov 13, 2024
Merged

Add mergiraf as default merge-driver, difft as default difftool #97

merged 4 commits into from
Nov 13, 2024

Conversation

Adjective-Object
Copy link
Owner

  • Adds mergiraf as a default merge-driver
  • Adds difft as the default difftool

Adjective-Object
Adjective-Object commented Nov 13, 2024
View reviewed changes
@Adjective-Object Adjective-Object enabled auto-merge (squash) November 13, 2024 21:07
@Adjective-Object Adjective-Object merged commit a0f4bdc into main Nov 13, 2024
7 checks passed
@Adjective-Object Adjective-Object deleted the mergiraf-difft branch November 13, 2024 21:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@Adjective-Object