Use the Git configuration variable for merge conflict style.

sageserpent-open / kineticMerge

Merge a heavily refactored codebase and stay sane.

MIT License

9 stars 1 forks source link

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

Open sageserpent-open opened 1 year ago

sageserpent-open commented 1 year ago

Use the merge.conflictStyle Git configuration variable to drive how git merge-file generates conflicts markers when that command is executed by Kinetic Merge.