Mercurial > hgbook

diff en/examples/tour-merge-conflict.merge.out @ 192:06ab90119fa6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Be more conservative in timeouts. Needed on my new, slower (!?) laptop.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 16 Apr 2007 14:39:51 -0700
parents 006bbad1f190
children e281bd9a8e47
line wrap: on
line diff