equal
deleted
inserted
replaced
209 |
209 |
210 Temporarily Included Files (for merge/rebase): |
210 Temporarily Included Files (for merge/rebase): |
211 hide |
211 hide |
212 |
212 |
213 $ cat hide |
213 $ cat hide |
214 <<<<<<< dest: 39278f7c08a9 - test: two |
214 <<<<<<< dest: 39278f7c08a9 - test: two |
215 y |
215 y |
216 ======= |
216 ======= |
217 z |
217 z |
218 >>>>>>> source: b91df4f39e75 - test: edit hide |
218 >>>>>>> source: b91df4f39e75 - test: edit hide |
219 |
219 |
220 Verify aborting a rebase cleans up temporary files |
220 Verify aborting a rebase cleans up temporary files |
221 |
221 |
222 $ hg rebase --abort --config extensions.rebase= |
222 $ hg rebase --abort --config extensions.rebase= |
223 cleaned up 1 temporarily added file(s) from the sparse checkout |
223 cleaned up 1 temporarily added file(s) from the sparse checkout |