Re: [PATCH v2 1/4] t4059: test 'diff --cc' with a change from only few parents

On Sat, Apr 11, 2015 at 10:51:10PM -0700, Junio C Hamano wrote: Max Kirillov m...@max630.net writes: My exact case was that there was a change in one branch which was overwritten during merge conflict resolution by fully acepting the other branch - in a 2-parent merge. I started looking for

Re: [PATCH v2 1/4] t4059: test 'diff --cc' with a change from only few parents

On Sat, Apr 11, 2015 at 2:07 PM, Junio C Hamano gits...@pobox.com wrote: Especially, we need to pay close attention to the discussion that germinated the current behaviour: http://thread.gmane.org/gmane.comp.version-control.git/15486/focus=15519 I recall that the diff --cc before that

Re: [PATCH v2 1/4] t4059: test 'diff --cc' with a change from only few parents

Max Kirillov m...@max630.net writes: If `git diff --cc` is used with 2 or more parents, then it shows all hunks which have changed compared to at least 2 parents. Which is reasonable, because those places are likely places for conflicts, and it should be displayed how they were resolved.

Re: [PATCH v2 1/4] t4059: test 'diff --cc' with a change from only few parents

Max Kirillov m...@max630.net writes: If `git diff --cc` is used with 2 or more parents, then it shows all hunks which have changed compared to at least 2 parents. Which is reasonable, because those places are likely places for conflicts, and it should be displayed how they were resolved. OK.

Re: [PATCH v2 1/4] t4059: test 'diff --cc' with a change from only few parents

On Sat, Apr 11, 2015 at 02:07:25PM -0700, Junio C Hamano wrote: Max Kirillov m...@max630.net writes: If `git diff --cc` is used with 2 or more parents, then it shows all hunks which have changed compared to at least 2 parents. Which is reasonable, because those places are likely places for

Re: [PATCH v2 1/4] t4059: test 'diff --cc' with a change from only few parents

Max Kirillov m...@max630.net writes: My exact case was that there was a change in one branch which was overwritten during merge conflict resolution by fully acepting the other branch - in a 2-parent merge. I started looking for a way to visualize such cases. They are not visible in usual

[PATCH v2 1/4] t4059: test 'diff --cc' with a change from only few parents

If `git diff --cc` is used with 2 or more parents, then it shows all hunks which have changed compared to at least 2 parents. Which is reasonable, because those places are likely places for conflicts, and it should be displayed how they were resolved. But, preliminary path filtering passes a path