tests/test-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Fri, 31 Aug 2007 13:14:03 +0200
changeset 5274 694eb9ccb54d
parent 3592 fffc8a733bf9
permissions -rw-r--r--
convert/subversion: Use util.set() instead of set() for python2.3 compatibility

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