Mercurial > hgbook

diff en/examples/tour-merge-conflict.son.out @ 484:0abd3d78172e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
finished translation of a figure translated a few paragraphs of tour-merge
author Javier Rojas <jerojasro@devnull.li>
date Sun, 02 Nov 2008 13:54:42 -0500
parents e281bd9a8e47
children
line wrap: on
line diff