branch | stable |
changeset 21947 | b081decd9062 |
parent 21267 | e4f451c8c05c |
child 23516 | 328afbad6e57 |
--- a/tests/test-rebase-detach.t Fri Jul 25 15:51:42 2014 -0500 +++ b/tests/test-rebase-detach.t Sat Jul 26 03:32:49 2014 +0200 @@ -374,7 +374,7 @@ unresolved conflicts (see hg resolve, then hg rebase --continue) [1] $ hg resolve --all -t internal:local - no more unresolved files + (no more unresolved files) $ hg rebase -c saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6215fafa5447-backup.hg (glob) $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n"