Mercurial > hg

diff tests/test-simplemerge.py.out @ 6363:bbfebf751ac8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-imerge: test resolve subcommand
author Patrick Mezard <pmezard@gmail.com>
date Sun, 23 Mar 2008 20:37:04 +0100
parents 2e3c54fb79a3
children f18830651811
line wrap: on
line diff