Re: Display of merges in gitk

From: Junio C Hamano <junkio@cox.net>
Date: Jul 30, 2005, 04:25 UTC
Message-ID: <7vy87o6htm.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <17130.56620.137642.941175@cargo.ozlabs.ibm.com>

Paul Mackerras <paulus@samba.org> writes:

> Linus, could you do a pull from the usual place to pick this up?
> (rsync://rsync.kernel.org/pub/scm/gitk/gitk.git).  I also included a
> patch from Junio.

In case you did not notice, /pub/scm/git/git.git/ repository is under the care of yours truly starting this week. I've merged from your tree up to this commit:

    commit c8a4acbf4a7b0f9da3e320877b2b2d12cd58700b
    Author: Paul Mackerras <paulus@samba.org>
    Date:   Fri Jul 29 09:23:03 2005 -0500

      Improve the merge display when the result differs from all parents.

      Now we see if the result is quite similar to one of the parents, and
      if it is, display the result as a diff from that parent.  If the result
      is similar to more than one parent, pick the one that it's most
      similar to.

Thanks for the great tool.