|
- Edit files in place. Diffs update dynamically.
- diff2 and diff3 support.
- User friendly diff browsing.
- Margins show location of changes.
- Tabbed interface - open many diffs at once.
- Next/prev diff.
- Unlimited undo.
- Middle column shows detailed changes, and allows merges.
- 2 and 3 way diff and merge. Conflicts are marked in red.
- Optionally uses gtksourceview for syntax highlighting.
|