Mercurial > hgbook

diff en/examples/tour-merge-conflict.merge.out @ 438:adb677612c39

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 83790457e85b
children bc14f94e726a
line wrap: on
line diff