Skip to content
Snippets Groups Projects
Commit 2deecec0 authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot
Browse files

Merge topic 'backport-script-merge-conflicts' into release 


940856b6 backport-script: handle merge conflicts when merging a branch

Acked-by: default avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !6702
parents 6cd7526a 940856b6
No related branches found
No related tags found
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