On Thu, 25 Aug 2016, Junio C Hamano wrote:
> > if (write_cache_as_tree(head, 0, NULL))
> > - die (_("Your index file is unmerged."));
> > + return error (_("Your index file is unmerged."));
> While you are touching the line, it is a good idea to correct an
> obvious style error like this one. "Do one thing and one thing well
> in a commit" is a good discipline, but it is absurd to take it to
> the extreme.
To be quite honest, I had to look *really* hard to see that space. It took
me literally 30 seconds to spot the style issue.
Fixed in v2,
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