view tests/test-merge5.out @ 3806:45a751d73080

zsh: fix completions with relative paths hg add ../foo/bar[TAB] now does what you expect
author Steve Borho <steve@borho.org>
date Tue, 05 Dec 2006 21:35:44 -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