Commit dd843737 authored by Brad King's avatar Brad King Committed by Kitware Robot

Merge topic 'add-missing-docstring'

584186fd reject_conflict_paths: add missing docstring
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Reviewed-by: Brad King's avatarBrad King <brad.king@kitware.com>
Merge-request: !134
parents b95ac22c 584186fd
Pipeline #138513 failed with stage
in 0 seconds
......@@ -35,6 +35,11 @@ impl RejectConflictPaths {
}
}
/// Require that the base file exist for the check to enforce paths.
///
/// If the base exists, then the conflict path patterns will always fire. However, this misses
/// the case where the base file was deleted and the conflict files left behind. Passing `true`
/// here rejects any path matching the conflict patterns.
pub fn require_base_exist(&mut self, require_base_exist: bool) -> &mut Self {
self.require_base_exist = require_base_exist;
self
......
Markdown is supported
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