Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Repository
56d707f1c33348670a8eea934b86445a37eae163
Switch branch/tag
emacs
lisp
smerge-mode.el
Find file
Blame
History
Permalink
(smerge-apply-resolution-patch): New fun.
· 56d707f1
Stefan Monnier
authored
Mar 31, 2008
(smerge-resolve): Add various resolution heuristics.
56d707f1
smerge-mode.el
46.3 KB
Edit
Web IDE
Replace smerge-mode.el
×
Attach a file by drag & drop or
click to upload
Commit message
Replace smerge-mode.el
Replace file
Cancel
A new branch will be created in your fork and a new merge request will be started.
