Mercurial > hg
comparison tests/simple-merge @ 28:9f64ee817199
Add some tests to the repo
author | mpm@selenic.com |
---|---|
date | Wed, 04 May 2005 22:57:51 -0800 |
parents | |
children |
comparison
equal
deleted
inserted
replaced
27:febfb35d2a3e | 28:9f64ee817199 |
---|---|
1 set -ex | |
2 export EDITOR=true | |
3 rm -rf test branch | |
4 | |
5 mkdir test | |
6 cd test | |
7 echo foo>foo | |
8 hg init | |
9 hg addremove | |
10 hg commit | |
11 hg verify | |
12 cd .. | |
13 | |
14 cp -a test branch | |
15 cd branch | |
16 echo bar>>foo | |
17 hg commit | |
18 | |
19 cd ../test | |
20 hg merge ../branch | |
21 hg verify | |
22 |