Mercurial > hgbook

diff en/tour-merge.tex @ 401:e281bd9a8e47

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix sample output for test 'tour-merge-conflict'. Fix test itself as well (now requires 'hg resolve').
author Guido Ostkamp <hg@ostkamp.fastmail.fm>
date Wed, 20 Aug 2008 22:00:46 +0200
parents d9d29e7cf5bd
children 1a4b507935de
line wrap: on
line diff