Mercurial > hgbook
diff en/tour-merge-conflict.svg @ 438:adb677612c39
copied the english version of this file to use it as basis for the translation.
There are a couple of paragraphs already translated
author | jerojasro@localhost |
---|---|
date | Sat, 18 Oct 2008 22:55:12 -0500 |
parents | 5b80c922ebdd |
children |