tests/test-merge5.out
author Matt Mackall <mpm@selenic.com>
Fri, 29 Dec 2006 20:04:31 -0600
changeset 3999 0b740dcf0cf1
parent 3592 fffc8a733bf9
permissions -rw-r--r--
symlinks: add basic symlink functions to util.py

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