Mercurial > hgbook
diff en/examples/tour-merge-conflict.son.out @ 515:15bf7d50b586
Translated a couple of paragraphs
author | jerojasro@devnull.li |
---|---|
date | Wed, 12 Nov 2008 22:36:35 -0500 |
parents | e281bd9a8e47 |
children |
author | jerojasro@devnull.li |
---|---|
date | Wed, 12 Nov 2008 22:36:35 -0500 |
parents | e281bd9a8e47 |
children |