Skip to content
Commit 8bdb6516 authored by Laurent Montel's avatar Laurent Montel
Browse files

Improve conflict resolve dialog 

Work based on David patch
parent 410953c9
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