Mercurial > hgbook

comparison en/examples/tour-merge-conflict.merge.out @ 453:11d7896cd2ac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merging changes from jerojasro
author Igor TAmara <igor@tamarapatino.org>
date Wed, 22 Oct 2008 01:51:33 -0500
parents 83790457e85b
children bc14f94e726a
comparison
equal deleted inserted replaced
452:d8596cd12b41 453:11d7896cd2ac