Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict @ 4361:46280c004f22
change tests to use simplemerge by default
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Mon, 16 Apr 2007 20:17:39 -0300 |
parents | e506c14382fd |
children | 93a4e72b4f83 |
line wrap: on
line source
#!/bin/sh hg init echo "nothing" > a hg add a hg commit -m ancestor -d "1000000 0" echo "something" > a hg commit -m branch1 -d "1000000 0" hg co 0 echo "something else" > a hg commit -m branch2 -d "1000000 0" hg merge 1 hg id egrep -v ">>>|<<<" a hg status