diff options
Diffstat (limited to 'proto/conflicts.proto')
| -rw-r--r-- | proto/conflicts.proto | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/proto/conflicts.proto b/proto/conflicts.proto index 6a6aa6753..416370abb 100644 --- a/proto/conflicts.proto +++ b/proto/conflicts.proto @@ -43,6 +43,7 @@ message ListConflictFilesRequest { // tree conflicts. If set to true, then responses may contain conflict files // where some of the paths are unset. bool allow_tree_conflicts = 4; + bool skip_file_contents = 5; } // This comment is left unintentionally blank. |