view tests/test-merge5.out @ 5763:e20de0caf8e7

Show number of changesets written to bundle files by default (issue569) This was only shown with -v before.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 30 Dec 2007 19:46:13 +0100
parents fffc8a733bf9
children 4b0c9c674707
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