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

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)