Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-conflict @ 808:8f5637f0a0c0
Merge with TAH
author | mpm@selenic.com |
---|---|
date | Sat, 30 Jul 2005 08:35:29 -0800 |
parents | 7e4843b7efd2 ec85f9e6f3b1 |
children | 0902ffece4b4 |
comparison
equal
deleted
inserted
replaced
788:64d2a558c943 | 808:8f5637f0a0c0 |
---|---|
1 #!/bin/sh | 1 #!/bin/sh |
2 | 2 |
3 set -x | |
4 hg init | 3 hg init |
5 echo "nothing" > a | 4 echo "nothing" > a |
6 hg add a | 5 hg add a |
7 hg commit -m ancestor -d "0 0" | 6 hg commit -m ancestor -d "0 0" |
8 echo "something" > a | 7 echo "something" > a |
9 hg commit -m branch1 -d "0 0" | 8 hg commit -m branch1 -d "0 0" |
10 hg co 0 | 9 hg co 0 |
11 echo "something else" > a | 10 echo "something else" > a |
12 hg commit -m branch2 -d "0 0" | 11 hg commit -m branch2 -d "0 0" |
13 export HGMERGE=merge | 12 HGMERGE=merge; export HGMERGE |
14 hg up -m 1 | 13 hg up -m 1 |
15 hg id | 14 hg id |
16 grep -Ev ">>>|<<<" a | 15 grep -Ev ">>>|<<<" a |
17 hg status | 16 hg status |