On 13/03/2013 19:57, Junio C Hamano wrote:
Kevin Bracey ke...@bracey.fi writes:
- echo Added $4 in both, but differently.
+ echo ERROR: Added $4 in both, but differently.
+ ret=1
The problem you identified may be worth fixing, but I do not think
this
Kevin Bracey ke...@bracey.fi writes:
I disagree here. At the minute, it does set ret to 1 (but further down
the code - bringing it up here next to the ERROR print clarifies
that), and will report the merge as failed, conflict in the 3-way
merge or not. Which I think is correct.
OK. I agree
On 14/03/2013 16:56, Junio C Hamano wrote:
Kevin Bracey ke...@bracey.fi writes:
Maybe the virtual base itself should be different. Maybe it should put
a ??? marker in place of every unique line. So you get:
Left ABCEFGH
Right XABCDEFJH - Merge result |XABC|DEFG|JH
VBase ?ABC?EF??H
On 14/03/2013 19:31, Kevin Bracey wrote:
On 14/03/2013 16:56, Junio C Hamano wrote:
Well, yes, but I would assume that we would forcibly select normal
diff here somehow, if we aren't already. We should be - turning
ABCDEFGH vs ABCD into ABCDEFGH|EFGH= is silly.
Doh. But anyway, we don't
On Tue, Mar 12, 2013 at 6:12 PM, Kevin Bracey ke...@bracey.fi wrote:
Commit 718135e improved the merge error reporting for the resolve
strategy's merge conflict and permission conflict cases, but led to a
malformed ERROR: in myfile.c message in the case of a file added
differently.
This
Kevin Bracey ke...@bracey.fi writes:
Commit 718135e improved the merge error reporting for the resolve
strategy's merge conflict and permission conflict cases, but led to a
malformed ERROR: in myfile.c message in the case of a file added
differently.
This commit reverts that change, and
6 matches
Mail list logo
