Diffs
The same diff view appears wherever Mergepond shows a change: beside the file list on Changes, under the file list in the History inspector, and in the file history sheet. It is a unified diff with two line-number columns and syntax highlighting.
Where to find it
- Changes tab: select a file.
- History tab › inspector: select a commit, then a file.
- Blame and history sheet › History: select a commit in the file's history.
What you see
| Part | Detail |
|---|---|
| Header | The path, the kind of change, and the added and removed line counts. On Changes it also carries Blame, History and Stage file or Unstage file; in the inspector, Blame and History. |
| Line numbers | Two columns: the line's number in the old version and in the new. A removed line has only an old number; an added line only a new one. |
| Lines | Removed lines are tinted koi and added lines lily. In the Greyscale scheme the tints stay and each line is also prefixed with + or −, so the diff reads without colour. |
| Highlighting | Code is syntax highlighted by file type. |
| Hunks | On Changes, when a file has more than one hunk or is partly staged, each hunk has its own Stage hunk or Unstage hunk button. |
Line-level changes are shown as whole removed and added lines; Mergepond doesn't draw word-level highlights within a line.
Special cases
| Case | Message |
|---|---|
| Binary file | "Binary file. There's no text diff to show." |
| Mode or rename only | "No line changes. Only the file's mode or name changed." |
| Very long diff | The view stops after 5000 lines: "This diff is long, so the rest isn't shown. Open the file in your editor to see all of it." |
| Untracked or newly added file | Every line is an addition. Blame and History are not offered, since the file has no history yet. |
Free and Pro
Diffs work the same on Free and Pro.