tests/test-topic-tutorial.t
changeset 2977 d1972a75c7d7
parent 2976 e5edfb5aba0c
child 2978 9280e78dbcba
equal deleted inserted replaced
2976:e5edfb5aba0c 2977:d1972a75c7d7
  1512   t1: Adding hammer to the shopping list
  1512   t1: Adding hammer to the shopping list
  1513   t0^ add a pair of shoes (base)
  1513   t0^ add a pair of shoes (base)
  1514 
  1514 
  1515 Solving this situation is easy with a topic: use merge or rebase.
  1515 Solving this situation is easy with a topic: use merge or rebase.
  1516 Merge within a multi-headed stack will use the other topic head as
  1516 Merge within a multi-headed stack will use the other topic head as
  1517 redestination if the topic has multiple heads.
  1517 destination if the topic has two heads.
  1518 
  1518 
  1519   $ hg log -G
  1519   $ hg log -G
  1520   @  changeset:   21:f936c6da9d61
  1520   @  changeset:   21:f936c6da9d61
  1521   |  tag:         tip
  1521   |  tag:         tip
  1522   |  topic:       tools
  1522   |  topic:       tools