view tests/test-merge5.out @ 3065:15526271eafb

allow shell-quoting in command defaults
author TK Soh <teekaysoh@yahoo.com>
date Thu, 07 Sep 2006 13:53:20 -0500
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