Mercurial > hgbook

log en/examples/tour-merge-conflict @ 648:bc14f94e726a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) tip
age author description
Thu, 29 Jan 2009 22:47:34 -0800 Bryan O'Sullivan Check in a known-broken example to fix up later - XXX
Wed, 20 Aug 2008 22:00:46 +0200 Guido Ostkamp Fix sample output for test 'tour-merge-conflict'.
Tue, 06 Mar 2007 20:46:07 -0800 Bryan O'Sullivan Add local regexps to ignore bits of output.
Thu, 19 Oct 2006 15:18:07 -0700 Bryan O'Sullivan More merge content.
less more | (0) tip