view tests/test-merge5.out @ 4561:a73d80d6385a

Revive commands.dispatch as a simple way to call hg from other pythons scripts. This was already used by hg-ssh and others and is really convenient if you just want a native equivalent of calling the command line version.
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 12 Jun 2007 17:39:57 +0200
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