equal
deleted
inserted
replaced
210 $ hg rebase -s 2 -d 6 -n |
210 $ hg rebase -s 2 -d 6 -n |
211 rebasing 2:177f92b77385 "c" |
211 rebasing 2:177f92b77385 "c" |
212 rebasing 3:055a42cdd887 "d" |
212 rebasing 3:055a42cdd887 "d" |
213 rebasing 4:e860deea161a "e" |
213 rebasing 4:e860deea161a "e" |
214 there will be no conflict, you can rebase |
214 there will be no conflict, you can rebase |
215 saved backup bundle to $TESTTMP/repo1/repo2/skrepo/.hg/strip-backup/c83b1da5b1ae-f1e0beb9-backup.hg |
|
216 rebase aborted |
215 rebase aborted |
217 |
216 |
218 $ hg diff |
217 $ hg diff |
219 $ hg status |
218 $ hg status |
220 |
219 |