view tests/test-empty @ 4358:465b9ea02868

Import 3-way merge code from bzr merge3.py is imported as contrib/simplemerge test_merge3.py is imported as tests/test-simplemerge.py
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Mon, 16 Apr 2007 20:17:39 -0300
parents 2b77ea66fe70
children
line wrap: on
line source

#!/bin/sh

hg init
hg log
hg grep wah
hg manifest
hg verify