Dario Bertini <berda...@gmail.com> writes: > On 02/14/2014 09:03 PM, Junio C Hamano wrote: >> This is a combined diff, and yaml-related lines are added relative >> to your _other_ branch you are merging (notice these + are indented >> by one place). Relative to what you had at the tip of your branch >> before you started this operation that ended up conflicted, the >> half-merged result removes if/else that sets DIST_MODULE_PATH and >> replaces it with a single line (their +/- are on the first column, >> signifying that these are differences relative to the first parent, >> i.e. your state before you started the operation). >> >>> if we remove these 3 lines, we'll get this diff: >> >> With that understanding, I think the output after removing these >> three lines is perfectlyh understandable and correct. You are >> looking at the three lines that used to exist in the version you >> started from, that were missing from the other side. If you remoe >> them, it will show as removal from _your_ version (notice these - >> that shows what _you_ did manually are on the first column, saying >> that that is relative to _your_ version). >> > > Thank you, I was completely unaware of combined diffs. Still: I can't > see how this would explain the empty diff when deleting 4 lines instead > of 3.
With a --cc diff (which it is: it says 'diff --cc' in the file headers) git doesn't show the combined diff for hunks that fully agree with one side. So if you (even manually) resolve the merge so that it fully matches one side, that will not show up in a --cc diff. -- Thomas Rast t...@thomasrast.ch -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
