Skip to main content
Retrieve a structured diff between two Mesa change IDs. Required scope: read
Fetch only conflicted entries:

Options

str
required
Repository name.
str
required
Base Mesa change ID.
str
required
Head Mesa change ID.
'include' | 'only' | 'exclude' | None
Controls whether conflicted entries are included, excluded, or returned exclusively.
str | None
Organization override.

Response

entries[] and conflicted_entries[] are mutually exclusive: unresolved conflicted paths appear only in conflicted_entries[].
str
Base change used for comparison.
str
Head change used for comparison.
DiffStats
Aggregate counts for the response.
bool
Whether the response hit the server entry limit and is incomplete.
list[DiffEntry]
Structural changed entries. Unchanged paths are omitted.
list[ConflictedDiffEntry]
Conflict-only details for unresolved paths.

DiffStats

int
Number of structural entries returned in entries[].
int
Total added lines across textual diff hunks.
int
Total deleted lines across textual diff hunks.
int
Sum of additions and deletions.
int
Number of paths returned in conflicted_entries[].
int
Total conflict hunk count across conflicted_entries[].

DiffEntry

str
Repository-relative path at the head change.
'added' | 'modified' | 'deleted' | 'renamed'
How the entry changed between the base and head changes.
str | None
Previous repository-relative path for renamed entries. Null for non-renames.
int | None
Approximate size in bytes of the changed entry content, not the textual diff.
bool
Always false for entries returned in entries[]. Conflicted paths are returned in conflicted_entries[].
'binary' | 'too_large' | 'file_limit' | None
Why textual hunk data is unavailable. Null when hunks is present.
list[DiffHunk] | None
Structured textual diff hunks. Null when omitted_reason is set.
list[DiffConflictHunk] | None
Structured conflict hunks for the entry, or null when there are none. Structural entries in entries[] normally return null.

DiffHunk

int
Starting line number in the base side.
int
Number of base-side lines covered by the hunk.
int
Starting line number in the head side.
int
Number of head-side lines covered by the hunk.
list[DiffLine]
Lines in this textual diff hunk.

DiffLine

'context' | 'added' | 'deleted' | 'annotation'
Line classification inside a textual diff hunk.
str
Line text.

ConflictedDiffEntry

str
Repository-relative path for the unresolved conflict.
list[DiffConflictHunk]
Per-hunk conflict detail. Empty when omitted_reason is set or the conflict is non-textual.
int | None
Approximate size in bytes of the largest side of the conflict.
'binary' | 'too_large' | None
Why hunk data is unavailable. When set, fetch file bytes with mesa.content.get() against the target or source change to compose a whole-file resolution.

DiffConflictHunk

str
Stable identifier for the conflict hunk.
int
Starting line number in the base side.
int
Number of base-side lines covered by the hunk.
int
Starting line number in the head side.
int
Number of head-side lines covered by the hunk.
ChangeConflictHunkSide | None
Target side of the conflicted hunk.
ChangeConflictHunkSide | None
Base side of the conflicted hunk.
ChangeConflictHunkSide | None
Source side of the conflicted hunk.

ChangeConflictHunkSide

str
Base64-encoded raw bytes for this side of the conflicted hunk.