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

Use the Git configuration variable for merge conflict style. #8

Open
sageserpent-open opened this issue May 17, 2023 · 0 comments
Open

Use the Git configuration variable for merge conflict style. #8

sageserpent-open opened this issue May 17, 2023 · 0 comments
Labels
enhancement New feature or request

Comments

@sageserpent-open
Copy link
Owner

Use the merge.conflictStyle Git configuration variable to drive how git merge-file generates conflicts markers when that command is executed by Kinetic Merge.
@sageserpent-open sageserpent-open added the enhancement New feature or request label May 18, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@sageserpent-open