From: Junio C Hamano <junkio@cox.net>
Date: Wed, 16 May 2007 22:08:24 GMT
Subject: Re: [PATCH 7/6] gitweb: Empty patch for merge means trivial merge, not no differences
Message-ID: <7v646se813.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <11793531552023-git-send-email-jnareb@gmail.com>

Jakub Narebski <jnareb@gmail.com> writes:

> Earlier commit 4280cde95fa4e3fb012eb6d0c239a7777baaf60c made gitweb
> show "No differences found" message for empty diff, for the HTML
> output. But for merge commits, either -c format we use or --cc format,
> empty diff doesn't mean no differences, but trivial merge.
>
> Show "Trivial merge" message instead of "No differences found" for
> merges.

Sounds good.  Some people might want to treat "-s ours" merge
specially (in real life, when two branches fix the same bug
differently the result of the hand-resolution may end up being
the same as "-s ours" merge), although I do not think it is such
a big deal.