Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-hgrc @ 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 | 7d66ce9895fa |
children | 7a7d4937272b |
line wrap: on
line source
#!/bin/sh mkdir t cd t hg init echo "invalid" > .hg/hgrc hg status 2>&1 |sed -e "s:/.*\(/t/.*\):...\1:"