Mercurial > hg > mercurial-crew-with-dirclash
comparison 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 |
comparison
equal
deleted
inserted
replaced
4360:d5c3a70f8422 | 4361:46280c004f22 |
---|---|
7 echo "something" > a | 7 echo "something" > a |
8 hg commit -m branch1 -d "1000000 0" | 8 hg commit -m branch1 -d "1000000 0" |
9 hg co 0 | 9 hg co 0 |
10 echo "something else" > a | 10 echo "something else" > a |
11 hg commit -m branch2 -d "1000000 0" | 11 hg commit -m branch2 -d "1000000 0" |
12 HGMERGE=merge; export HGMERGE | |
13 hg merge 1 | 12 hg merge 1 |
14 hg id | 13 hg id |
15 egrep -v ">>>|<<<" a | 14 egrep -v ">>>|<<<" a |
16 hg status | 15 hg status |