[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: smerge-ediff "MINE" and "OTHER" monikers unhelpful
From: |
Stefan Monnier |
Subject: |
Re: smerge-ediff "MINE" and "OTHER" monikers unhelpful |
Date: |
Wed, 27 Nov 2013 12:37:58 -0500 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) |
> For one thing, smerge-ediff (purportedly as opposed to the smerge-mode
> not visibly involved in the user interaction) does not expose _any_ of
We can't assume that the user of smerge-ediff does not also use smerge.
So it's important to keep a connection between the names used in smerge
and the names used in ediff. Maybe in your case it's not helpful, but
I think the added text should clarify the problem (and the 5/6 extra
chars may occasionally push the extra info past the truncation, but
this truncation problem exists even without those extra 5/6 chars).
> git pull -r
> it labels the upstream changes as "MINE" and my own changes as "OTHER".
Of course, any tool is free top put the 2 in whichever order they
prefer. Maybe we should revisit the MINE/OTHER names used so far.
But whichever name we use there will need to also be present in
smerge-ediff.
Stefan
- Re: smerge-ediff "MINE" and "OTHER" monikers unhelpful, Stefan Monnier, 2013/11/22
- 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 <=
- 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, 2013/11/28
- 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