tests/test-merge5.out
author Matt Mackall <mpm@selenic.com>
Mon, 08 Oct 2007 18:47:12 -0500
changeset 5422 a3ba7ef98c94
parent 3592 fffc8a733bf9
permissions -rw-r--r--
osutil: eliminate alloca call - make full_path a PATH_MAX + epsilon local buffer - use strncpy and strncat

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