5.8 Ediff ¶
Casual Ediff is a user interface for Ediff (Ediff), a visual interface for the Unix diff and patch utilities. Casual Ediff strives to improve the usability of Ediff by simplifying the following workflows:
- Comparing a modified and uncommitted version-controlled file with its most recent commit.
- Resolving a merge conflicted file.
Notable features of Casual Ediff include:
- Context aware menu items.
- Menu design tuned for side-by-side comparison.
- For a merge conflict, the ability to resolve using both the conflicting diff versions.
Shown below is screenshot of the Casual Ediff in action for a version-controlled file.
