# HG changeset patch
# User Aurélien Campéas
# Date 1506006376 -7200
# Node ID 9280e78dbcba8d51405eaabfd72825ee1035fcf3
# Parent  d1972a75c7d706d4e7bca370ad4bff0fb81ab68f
topics/tuto: prefer rebase over merge and remove the weird merge attempt

diff -r d1972a75c7d7 -r 9280e78dbcba tests/test-topic-tutorial.t
--- a/tests/test-topic-tutorial.t	Thu Sep 21 17:04:24 2017 +0200
+++ b/tests/test-topic-tutorial.t	Thu Sep 21 17:06:16 2017 +0200
@@ -1514,7 +1514,8 @@
 
 Solving this situation is easy with a topic: use merge or rebase.
 Merge within a multi-headed stack will use the other topic head as
-destination if the topic has two heads.
+destination if the topic has two heads. But rebasing will yield a
+completely linear history so it's what we will do.
 
   $ hg log -G
   @  changeset:   21:f936c6da9d61
@@ -1751,10 +1752,6 @@
   rebasing 20:bae3758e46bf "Adding drill"
   merging shopping
 
-  $ hg commit -m "Merge tools"
-  nothing changed
-  [1]
-
   $ hg stack
   ### topic: tools
   ### branch: default, 2 behind