ruby/proto/gitaly/conflicts_pb.rb in gitaly-1.75.0 vs ruby/proto/gitaly/conflicts_pb.rb in gitaly-1.76.0
- old
+ new
@@ -9,10 +9,9 @@
optional :repository, :message, 1, "gitaly.Repository"
optional :our_commit_oid, :string, 2
optional :their_commit_oid, :string, 3
end
add_message "gitaly.ConflictFileHeader" do
- optional :repository, :message, 1, "gitaly.Repository"
optional :commit_oid, :string, 2
optional :their_path, :bytes, 3
optional :our_path, :bytes, 4
optional :our_mode, :int32, 5
end