view tests/test-merge5.out @ 2884:fcdcf0c19998

add default values to arguments of walk etc.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Sun, 13 Aug 2006 17:03:03 -0700
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