Re: [PATCH 1/4] Add test for showing discarded changes with diff --cc

2015-04-03 Thread Max Kirillov
On Thu, Apr 02, 2015 at 01:55:58PM -0700, Junio C Hamano wrote: So I'll give a preliminary nitpicks first ;-) Thank you; fixed the issues you mentioned. + test_seq 11 | sed -e s/^7/7change1/ -e s/^11/11change2/ -e s/^2/2change2/ long/only2 +git add long/only2 Patch is line-wrapped

[PATCH 1/4] Add test for showing discarded changes with diff --cc

2015-04-02 Thread Max Kirillov
If a hunk has been changed in both branches and conflict resolution fully takes one of branches, discarding all changes that are in the other, then the merge is not shown in 3-way diff which git uses by default. The advice is to use flag --cc and and explicitly add the mergebase was given in

Re: [PATCH 1/4] Add test for showing discarded changes with diff --cc

2015-04-02 Thread Junio C Hamano
deliberately (in which case this patch may be breaking things) or not. So I'll give a preliminary nitpicks first ;-) Subject: Re: [PATCH 1/4] Add test for showing discarded changes with diff --cc Subject: t4059: test 'diff --cc' with a change from only few parents or something? area: what