710   $ hg tglog

   710   $ hg tglog

   711   o  3: 63668d570d21 'C'

   711   o  3: 63668d570d21 'C'

   712   |

   712   |

   713   | @  2: 82b8abf9c185 'D'

   713   | @  2: 82b8abf9c185 'D'

   714   | |

   714   | |

   716   |/

   716   |/

   717   o  0: 4a2df7238c3b 'A'

   717   o  0: 4a2df7238c3b 'A'

   718   

   718   

   719   $ cat A

   719   $ cat A

   720   <<<<<<< dest:   82b8abf9c185 D - test: D

   720   <<<<<<< dest:   82b8abf9c185 D - test: D

   734   merging A

   734   merging A

   735   warning: conflicts while merging A! (edit, then use 'hg resolve --mark')

   735   warning: conflicts while merging A! (edit, then use 'hg resolve --mark')

   736   unresolved conflicts (see hg resolve, then hg rebase --continue)

   736   unresolved conflicts (see hg resolve, then hg rebase --continue)

   737   [1]

   737   [1]

   738   $ hg tglog

   738   $ hg tglog

   740   |

   740   |

   741   | @  2: 82b8abf9c185 'D'

   741   | @  2: 82b8abf9c185 'D'

   742   | |

   742   | |

   743   o |  1: f899f3910ce7 'B'

   743   o |  1: f899f3910ce7 'B'

   744   |/

   744   |/