|
| From: | Stefan Monnier |
| Subject: | Re: smerge-mode is fantastic, but it annoys me |
| Date: | Tue, 03 Mar 2015 13:10:21 -0500 |
| User-agent: | Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) |
> Me too! I didn't know about smerge-auto-leave, so I'm giving that a try
> (thanks Nicolas!). Now to generate some conflicts...
C-SPC ... C-SPC ... M-x smerge-makeup-conflict
Stefan
| [Prev in Thread] | Current Thread | [Next in Thread] |