Mercurial > hg

diff tests/test-merge-prompt.out @ 6998:ddfcefab8b97

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, 06 Sep 2008 17:04:01 +0200
parents 4b0c9c674707
children 01ada7b1861d
line wrap: on
line diff