Mercurial > hg

diff tests/test-simplemerge.py @ 12294:f2f6d838064a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 14 Sep 2010 16:21:21 -0500
parents e433002acb05
children 7de7630053cb
line wrap: on
line diff