tests/test-merge2.out
author Matt Mackall <mpm@selenic.com>
Sat, 29 Oct 2005 13:45:01 -0700
changeset 1481 acd1832ebf31
parent 925 5a034646e472
child 2175 b2ae81a7df29
permissions -rw-r--r--
Change test-hook to test multiple hooks

adding b
adding b