##// END OF EJS Templates
spares: clarify some test about merging copies...
marmoute -
r50254:76b4b36c default
parent child Browse files
Show More
@@ -182,6 +182,10 b' another'
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
General Comments 0
You need to be logged in to leave comments. Login now