Andros Fenollosa
0af93ada76
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.
26 lines
251 B
Plaintext
26 lines
251 B
Plaintext
# Emacs
|
|
*~
|
|
\#*\#
|
|
*.elc
|
|
auto-save-list
|
|
tramp
|
|
.\#*
|
|
|
|
# Emacs package development
|
|
.cask/
|
|
dist/
|
|
*.tar
|
|
*.tar.gz
|
|
|
|
# OS generated files
|
|
.DS_Store
|
|
.DS_Store?
|
|
._*
|
|
.Spotlight-V100
|
|
.Trashes
|
|
ehthumbs.db
|
|
Thumbs.db
|
|
|
|
# User instructions (never commit this)
|
|
CLAUDE.md
|