Hi, On Mon, 18 Feb 2008, Junio C Hamano wrote: > Johannes Schindelin <Johannes.Schindelin@xxxxxx> writes: > > > When a merge conflicts, there are often less than three common lines > > between two conflicting regions. > > > > Since a conflict takes up as many lines as are conflicting, plus three > > lines for the commit markers, the output will be shorter (and thus, > > simpler) in this case, if the common lines will be merged into the > > conflicting regions. > > > > This patch merges up to three common lines into the conflicts. > > I can give immediate positive feedback to this. > > When I rebuilt "next" last night, I considered rebasing its constituent > branches while I was at it (I ended up not doing that as I felt it was > too much). > > The tip of js/reflog-delete used to be at cb97cc9. Rebasing this on top > of any recent master will give you unreadable conflicts in > t/t1410-reflog.sh, but with these two patches (but the second one does > not have chance to kick in for this particular case) the result is quite > obvious and much cleaner. Great! Note that the _ALNUM stuff was meant more for discussion, as it only is activated for merge-file, not for merge-recursive or blame or all the other (indirect) users of xdl_merge(). I am a bit hesitant on activating it, since merging is pretty important, after all, and if I break things with it... Ciao, Dscho - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
