changeset 18778 | 1ef89df2c248 |
parent 17005 | 50f434510da6 |
child 18933 | 42b620fc89e2 |
--- a/tests/test-rebase-detach.t Sun Mar 17 23:27:14 2013 -0500 +++ b/tests/test-rebase-detach.t Fri Mar 15 11:23:29 2013 -0700 @@ -326,8 +326,6 @@ $ hg ci -m "J" $ hg rebase -s 8 -d 7 --collapse --config ui.merge=internal:other - remote changed E which local deleted - use (c)hanged version or leave (d)eleted? c saved backup bundle to $TESTTMP/a6/.hg/strip-backup/*-backup.hg (glob) $ hg tglog