rogerdudler/git-guide — pull request #50 by mehdichaouch (2013-04-28 16:07:26+00:00)
Title: Correction d'orthographe

It's writen _"dans les deux cas, git **tentre** d'auto-fusionner les changements."_
Bold word is not correct, **tente** is right.