equal
deleted
inserted
replaced
94 hg up -C |
94 hg up -C |
95 hg transplant 1 |
95 hg transplant 1 |
96 hg transplant --continue |
96 hg transplant --continue |
97 hg transplant 1:3 |
97 hg transplant 1:3 |
98 hg locate |
98 hg locate |
|
99 cd .. |
|
100 |
|
101 # Test transplant --merge (issue 1111) |
|
102 echo % test transplant merge |
|
103 hg init t1111 |
|
104 cd t1111 |
|
105 echo a > a |
|
106 hg ci -Am adda |
|
107 echo b >> a |
|
108 hg ci -m appendb |
|
109 echo c >> a |
|
110 hg ci -m appendc |
|
111 hg up -C 0 |
|
112 echo d >> a |
|
113 hg ci -m appendd |
|
114 echo % tranplant |
|
115 hg transplant -m 1 |
|
116 cd .. |