Jakub Narebski <jnareb@xxxxxxxxx> 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. - 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
