--- a/tests/test-obsolete.t Tue Oct 23 15:05:32 2012 +0200
+++ b/tests/test-obsolete.t Tue Oct 23 15:44:24 2012 +0200
@@ -376,7 +376,7 @@
commit: 1 deleted, 2 unknown (clean)
update: 4 new changesets, 4 branch heads (merge)
unstable: 1 changesets
- conflicting: 1 changesets
+ divergent: 1 changesets
$ qlog
6
- 909a0fb57e5d
@@ -497,7 +497,7 @@
$ hg rebase -s 7 -d 4 2>&1 | grep -v 'whole rebase'
nothing to rebase
$ hg rebase -b '3' -d 4 --traceback
- 2 new conflicting changesets
+ 2 new divergent changesets
$ hg log -G --template='{rev} - {node|short} {desc}\n'
@ 11 - 9468a5f5d8b2 add obsol_d''
|