Re: "Conflict discovered" vs "Conflicts discovered"

--On August 17, 2007 6:14:22 PM -0700 Karl Fogel <kfogel@red-bean.com>
wrote:
...
> So, I suggest we simply add an "s":
>
> Conflicts discovered in 'iota'.
> Select: (p)ostpone, (d)iff, (e)dit, (h)elp :
>
> That still works for the single-conflict case (note that people often
> say "we've got conflicts" even when there's just one conflicting
> hunk), and it's much better for the multiple-conflicts case.
>
> Any objections if I make this change?

I'd be partial to either "s", or "(s)", and am in favor of such a change.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Aug 18 09:41:26 2007