Use smerge minor mode in emacs to resolve conflicts.
The condition-case is used to suppress errors with emacs versions before 21.
Please register or sign in to comment
The condition-case is used to suppress errors with emacs versions before 21.