comparison en/examples/tour-merge-conflict.pull.out @ 530:f809de31887a

more translation :D added a term to the glossary
author jerojasro@localhost
date Sun, 30 Nov 2008 18:41:51 -0500
parents e281bd9a8e47
children
comparison
equal deleted inserted replaced
529:3afc654d70e5 530:f809de31887a