view tests/test-merge5.out @ 3397:f0415b61949d

document the diffstat option of the notify extension
author Aurelien Jacobs <aurel@gnuage.org>
date Sun, 15 Oct 2006 16:35:47 +0200
parents 49988d9f0758
children 41989e55fa37
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