equal
deleted
inserted
replaced
180 $ hg merge |
180 $ hg merge |
181 temporarily included 1 file(s) in the sparse checkout for merging |
181 temporarily included 1 file(s) in the sparse checkout for merging |
182 merging a and amove to amove |
182 merging a and amove to amove |
183 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
183 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
184 (branch merge, don't forget to commit) |
184 (branch merge, don't forget to commit) |
|
185 $ hg status --copies |
|
186 M amove |
|
187 a |
|
188 R a |
185 |
189 |
186 $ hg up -C 4 |
190 $ hg up -C 4 |
187 cleaned up 1 temporarily added file(s) from the sparse checkout |
191 cleaned up 1 temporarily added file(s) from the sparse checkout |
188 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
192 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
189 |
193 |