Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-rebase-newancestor.t
changeset 23426 19ebd2f88fc7
parent 23408 36dcd3db70ab
child 23516 328afbad6e57 
--- a/tests/test-rebase-newancestor.t	Fri Nov 28 20:16:15 2014 +0100
+++ b/tests/test-rebase-newancestor.t	Mon Dec 01 19:34:11 2014 -0600
@@ -127,10 +127,10 @@
   $ hg rebase -r 'only(dev,default)' -d default
   remote changed f-default which local deleted
   use (c)hanged version or leave (d)eleted? c
-  local changed f-default which remote deleted
-  use (c)hanged version or (d)elete? c
   saved backup bundle to $TESTTMP/ancestor-merge/.hg/strip-backup/1d1a643d390e-backup.hg (glob)
   $ hg tglog
+  o  6: 'dev: merge default'
+  |
   o  5: 'dev: merge default'
   |
   o  4: 'dev: f-dev stuff'
@@ -151,10 +151,10 @@
   $ hg rebase -r 'children(only(dev,default))' -d default
   remote changed f-default which local deleted
   use (c)hanged version or leave (d)eleted? c
-  local changed f-default which remote deleted
-  use (c)hanged version or (d)elete? c
   saved backup bundle to $TESTTMP/ancestor-merge-2/.hg/strip-backup/ec2c14fb2984-backup.hg (glob)
   $ hg tglog
+  o  7: 'dev: merge default'
+  |
   o  6: 'dev: merge default'
   |
   o  5: 'dev: f-dev stuff'
mercurial