On 09/28/2010 05:23 PM, Johan Herland wrote:
> ++
> +If conflicts arise (and a strategy for automatically resolving
> +conflicting notes (see the -s/--strategy option) is not given,
> +the merge fails (TODO).
Unbalanced '(' here. Can you just drop the first one?
--
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