[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: smerge-mode is fantastic, but it annoys me
|
From: |
Barry Warsaw |
|
Subject: |
Re: smerge-mode is fantastic, but it annoys me |
|
Date: |
Tue, 3 Mar 2015 09:53:33 -0500 |
On Mar 02, 2015, at 05:47 PM, Daniel Colascione wrote:
>smerge-mode is handy for resolving conflicts, but it's annoying that
>after resolving them all, smerge turns itself off, and C-c ^ n starts
>inserting stray "n" characters in the buffer. Can we just leave smerge
>on after resolving conflicts?
Me too! I didn't know about smerge-auto-leave, so I'm giving that a try
(thanks Nicolas!). Now to generate some conflicts...
Cheers,
-Barry
pgpkkAsrHTIvZ.pgp
Description: OpenPGP digital signature
- smerge-mode is fantastic, but it annoys me, Daniel Colascione, 2015/03/02
- Re: smerge-mode is fantastic, but it annoys me, Nicolas Richard, 2015/03/03
- Re: smerge-mode is fantastic, but it annoys me, Stefan Monnier, 2015/03/03
- Re: smerge-mode is fantastic, but it annoys me, Nicolas Richard, 2015/03/04
- Re: smerge-mode is fantastic, but it annoys me, Ivan Shmakov, 2015/03/04
- Re: smerge-mode is fantastic, but it annoys me, Nicolas Richard, 2015/03/04
- Re: smerge-mode is fantastic, but it annoys me, John Yates, 2015/03/04
- Re: smerge-mode is fantastic, but it annoys me, Nicolas Richard, 2015/03/05
Re: smerge-mode is fantastic, but it annoys me,
Barry Warsaw <=