tests/test-merge5.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Mon, 16 Jan 2006 15:51:09 +0100
changeset 1622 5e9168401a68
parent 925 5a034646e472
child 2019 ced2d3620f95
permissions -rw-r--r--
fix locate broken since 63799b01985c - fix the keyword arguments for walk in commands.locate - implement 'hg locate -r <rev>' - add a test for 'hg locate'

removing b
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use update -m to merge across branches or -C to lose changes)