equal
deleted
inserted
replaced
208 merging shelve_file1 |
208 merging shelve_file1 |
209 merging shelve_file1 failed! |
209 merging shelve_file1 failed! |
210 merge halted after failed merge (see hg resolve) |
210 merge halted after failed merge (see hg resolve) |
211 [240] |
211 [240] |
212 $ hg shelve --list |
212 $ hg shelve --list |
213 default (* ago) changes to: foo (glob) |
213 default (*s ago) * changes to: foo (glob) |
214 $ hg unshelve --abort |
214 $ hg unshelve --abort |
215 unshelve of 'default' aborted |
215 unshelve of 'default' aborted |