Skip to content
Snippets Groups Projects
Commit 34edd8f7 authored by Andreas Gohr's avatar Andreas Gohr
Browse files

Merge pull request #1529 from micgro42/addDiff3Functionality 

Add generic 3way merge capability
parents 3bc01074 34df7cb0
Hide whitespace changes
Inline Side-by-side
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