ibizaman / emacs-conflict

Resolve conflicts happening when using file synchronization tools

ibizaman/emacs-conflict Issues

Backup or trash conflict file instead of remove
Updated 2 years ago3
ivy-read: Wrong type argument: symbolp, "Completion conflict history"
Closed 3 years ago6
Name of the repo is emacs-conflicts, but README has straight example of emacs-conflict
Closed 4 years ago1