Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 4561:8044be585b91

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dispatch: restore a dropped shlex import Add test-dispatch as a place for command parsing and dispatch tests.
author Brendan Cully <brendan@kublai.com>
date Tue, 12 Jun 2007 13:21:42 -0700
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