Commit 2ae1bcfc authored by Brad King's avatar Brad King Committed by Kitware Robot

Merge topic 'conflict-no-base'

0dcc7eed reject_conflict_paths: support rejecting conflict files outright
0fa40753 reject_conflict_paths: use `new` constructor method
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !128
parents 32f68f50 0dcc7eed
Pipeline #137062 passed with stage
in 0 seconds