M-x shell Run bash shell
M-x slime Run Common Lisp REPL
M-x smerge-ediff Resolve merge conflicts in multi-window mode
M-x smerge-mode Resolve merge conflicts by hunks
M-x shell Run bash shell
M-x slime Run Common Lisp REPL
M-x smerge-ediff Resolve merge conflicts in multi-window mode
M-x smerge-mode Resolve merge conflicts by hunks