[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: smerge-ediff "MINE" and "OTHER" monikers unhelpful
From: |
Thien-Thi Nguyen |
Subject: |
Re: smerge-ediff "MINE" and "OTHER" monikers unhelpful |
Date: |
Thu, 28 Nov 2013 09:44:11 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) |
() Stefan Monnier <address@hidden>
() Wed, 27 Nov 2013 15:46:59 -0500
For three-way merges, the 3rd is called "BASE" in smerge, which makes
sense, no matter how you get that result. Using A/B/Base is not great
because of the conflicting first letter of B and Base.
Maybe we could go with X/Y/Base?
You can also think of A/B/Common, in which case C is fine.
That's what i do.
--
Thien-Thi Nguyen
GPG key: 4C807502
(if you're human and you know it)
read my lisp: (responsep (questions 'technical)
(not (via 'mailing-list)))
=> nil
pgp2e4wk2GANp.pgp
Description: PGP signature
- Re: smerge-ediff "MINE" and "OTHER" monikers unhelpful, (continued)
- Re: smerge-ediff "MINE" and "OTHER" monikers unhelpful, David Kastrup, 2013/11/23
- Re: smerge-ediff "MINE" and "OTHER" monikers unhelpful, David Kastrup, 2013/11/23
- Re: smerge-ediff "MINE" and "OTHER" monikers unhelpful, Stefan Monnier, 2013/11/25
- Re: smerge-ediff "MINE" and "OTHER" monikers unhelpful, David Kastrup, 2013/11/27
- Re: smerge-ediff "MINE" and "OTHER" monikers unhelpful, Stefan Monnier, 2013/11/27
- Re: smerge-ediff "MINE" and "OTHER" monikers unhelpful, David Kastrup, 2013/11/27
- Re: smerge-ediff "MINE" and "OTHER" monikers unhelpful, David Kastrup, 2013/11/27
- Re: smerge-ediff "MINE" and "OTHER" monikers unhelpful, Stefan Monnier, 2013/11/27
- Re: smerge-ediff "MINE" and "OTHER" monikers unhelpful,
Thien-Thi Nguyen <=
- Re: smerge-ediff "MINE" and "OTHER" monikers unhelpful, Stefan Monnier, 2013/11/28
- Re: smerge-ediff "MINE" and "OTHER" monikers unhelpful, David Kastrup, 2013/11/28