Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-conflict.out @ 749:7e4843b7efd2
Update tests to use commit -m and default -u
manifest hash: 6e4385453843031a712005a320d6000595b40d05
author | mpm@selenic.com |
---|---|
date | Thu, 21 Jul 2005 15:05:17 -0500 |
parents | c5df1a9c5276 |
children | 1f9ec150a476 8f5637f0a0c0 0902ffece4b4 |
comparison
equal
deleted
inserted
replaced
748:c5df1a9c5276 | 749:7e4843b7efd2 |
---|---|
1 + hg init | 1 + hg init |
2 + echo nothing | 2 + echo nothing |
3 + hg add a | 3 + hg add a |
4 + hg commit -t ancestor -u test -d '0 0' | 4 + hg commit -m ancestor -d '0 0' |
5 + echo something | 5 + echo something |
6 + hg commit -t branch1 -u test -d '0 0' | 6 + hg commit -m branch1 -d '0 0' |
7 + hg co 0 | 7 + hg co 0 |
8 + echo 'something else' | 8 + echo 'something else' |
9 + hg commit -t branch2 -u test -d '0 0' | 9 + hg commit -m branch2 -d '0 0' |
10 + export HGMERGE=merge | 10 + export HGMERGE=merge |
11 + HGMERGE=merge | 11 + HGMERGE=merge |
12 + hg up -m 1 | 12 + hg up -m 1 |
13 merge: warning: conflicts during merge | 13 merge: warning: conflicts during merge |
14 merging a | 14 merging a |