Code review comment for lp:~vila/bzr/mergetool-doc

> Typo, 'conflit'. But actually I find the sentence still rather hard to read,
> let's see if I can help...

Thanks ;)

> Something like that? This is user-focused after all, so they shouldn't really
> care too much about the details.

Agreed, done.