Andros Fenollosa 0af93ada76 Initial commit: conflict-buttons package ...

Add clickable inline buttons for merge conflict resolution in Emacs.

Features:
- One-click resolution with Accept Current/Incoming/Both/Compare actions
- Automatic activation with smerge-mode
- Mouse hover highlighting
- Customizable button styles (Unicode/ASCII)
- Auto-refresh after conflict resolution

Includes comprehensive README and example configurations.

2026-02-22 21:26:56 +01:00

251 B

Raw Permalink Blame History

View Raw