changeset 13956 | ffb5c09ba822 |
parent 12681 | bc13e17067d9 |
child 15619 | 6c8573dd1b6b |
13954:1184bb274cb3 | 13956:ffb5c09ba822 |
---|---|
1 $ HGMERGE=true; export HGMERGE |
1 $ HGMERGE=true; export HGMERGE |
2 |
2 |
3 $ mkdir r1 |
3 $ hg init r1 |
4 $ cd r1 |
4 $ cd r1 |
5 $ hg init |
|
6 $ echo a > a |
5 $ echo a > a |
7 $ hg addremove |
6 $ hg addremove |
8 adding a |
7 adding a |
9 $ hg commit -m "1" |
8 $ hg commit -m "1" |
10 |
9 |