view tests/test-merge5.out @ 6024:3121f0feefb4

keyword: nokwcommands, restricted string variables at top level - prettier syntax conforming eg. to commands.norepo - possibly easier to hook from outside
author Christian Ebert <blacktrash@gmx.net>
date Mon, 04 Feb 2008 21:08:45 +0100
parents fffc8a733bf9
children 4b0c9c674707
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