view tests/test-merge5.out @ 4818:0ac6b537893f

interhg extension allows you to change changelog text like InterWiki.
author OHASHI Hideya <ohachige@gmail.com>
date Tue, 03 Jul 2007 00:13:52 +0900
parents fffc8a733bf9
children
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes