tests/test-merge5.out
author Matt Mackall <mpm@selenic.com>
Fri, 29 Dec 2006 20:04:31 -0600
changeset 4006 67982d3ee76c
parent 3592 fffc8a733bf9
permissions -rw-r--r--
symlinks: add flags param to wwrite Now wwrite can set symlink and exec for files

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