Mercurial > hg

diff tests/test-merge-local.out @ 7538:8440baba78f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with -stable
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sat, 20 Dec 2008 00:43:03 +0100
parents 92ccccb55ba3
children a964ab624385
line wrap: on
line diff