diff options
Diffstat (limited to 'proto/conflicts.proto')
| -rw-r--r-- | proto/conflicts.proto | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/proto/conflicts.proto b/proto/conflicts.proto index c60b5baf1..b8eedb8a1 100644 --- a/proto/conflicts.proto +++ b/proto/conflicts.proto @@ -29,6 +29,10 @@ message ListConflictFilesRequest { Repository repository = 1 [(target_repository)=true]; string our_commit_oid = 2; string their_commit_oid = 3; + // AllowTreeConflicts will not cause the request to fail in case there are + // tree conflicts. If set to true, then responses may contain conflict files + // where some of the paths are unset. + bool allow_tree_conflicts = 4; } message ConflictFileHeader { |