Skip to content
GitLab
Commit eb762520 authored by Frederik Gladhorn's avatar Frederik Gladhorn Committed by Jędrzej Nowacki
Browse files

Add mergetool option to merge script 


Change-Id: I79ded5e4a437e84d444f98e20c70bef023f66398
Reviewed-by: default avatarJędrzej Nowacki <jedrzej.nowacki@digia.com>
parent c482d4f3
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 7 additions and 1 deletion
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