Show More
@@ -22,8 +22,6 b' cd ../test1' | |||||
22 | echo 123 >>a |
|
22 | echo 123 >>a | |
23 | hg ci -t "a updated" -u test -d "0 0" |
|
23 | hg ci -t "a updated" -u test -d "0 0" | |
24 |
|
24 | |||
25 | ls -l ../test[12]/a |
|
|||
26 |
|
||||
27 | hg merge ../test2 |
|
25 | hg merge ../test2 | |
28 | hg heads |
|
26 | hg heads | |
29 | hg history |
|
27 | hg history |
@@ -5,8 +5,6 b' adding manifests' | |||||
5 | adding file revisions |
|
5 | adding file revisions | |
6 | modified 2 files, added 1 changesets and 2 new revisions |
|
6 | modified 2 files, added 1 changesets and 2 new revisions | |
7 | (run 'hg update' to get a working copy) |
|
7 | (run 'hg update' to get a working copy) | |
8 | -rw-r--r-- 1 oxymoron oxymoron 4 Jun 22 03:04 ../test1/a |
|
|||
9 | -rwxr-xr-x 1 oxymoron oxymoron 0 Jun 22 03:04 ../test2/a |
|
|||
10 | pulling from ../test2 |
|
8 | pulling from ../test2 | |
11 | searching for changes |
|
9 | searching for changes | |
12 | adding changesets |
|
10 | adding changesets |
General Comments 0
You need to be logged in to leave comments.
Login now