view tests/test-merge5.out @ 3739:16f8e7d1dd54

fix notify with new ui buffering
author Matt Mackall <mpm@selenic.com>
date Fri, 01 Dec 2006 01:28:20 -0600
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