Skip to content
GitLab
Commit 2a671ffb authored by Pierre-Marie de Rodat's avatar Pierre-Marie de Rodat
Browse files

Add a Merge function overload for customized conflicts handling 

As an alternative to GitHub PR #9
parent 1a3bdfb9
Hide whitespace changes
Inline Side-by-side
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment